From a6f111798b463840fe24449f7805b6701e78bd64 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 22 Jun 2022 00:05:45 +0200
Subject: [PATCH] fix(emqx_management): fix topics (routes) cli list command

---
 apps/emqx_management/src/emqx_management.app.src   | 2 +-
 apps/emqx_management/src/emqx_management.appup.src | 7 +++++++
 apps/emqx_management/src/emqx_mgmt_cli.erl         | 5 +----
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 apps/emqx_management/src/emqx_management.appup.src

diff --git a/apps/emqx_management/src/emqx_management.app.src b/apps/emqx_management/src/emqx_management.app.src
index 0ca60e3d6..1cc0a477b 100644
--- a/apps/emqx_management/src/emqx_management.app.src
+++ b/apps/emqx_management/src/emqx_management.app.src
@@ -2,7 +2,7 @@
 {application, emqx_management, [
     {description, "EMQX Management API and CLI"},
     % strict semver, bump manually!
-    {vsn, "5.0.0"},
+    {vsn, "5.0.1"},
     {modules, []},
     {registered, [emqx_management_sup]},
     {applications, [kernel, stdlib, emqx_plugins, minirest, emqx]},
diff --git a/apps/emqx_management/src/emqx_management.appup.src b/apps/emqx_management/src/emqx_management.appup.src
new file mode 100644
index 000000000..9c701cce4
--- /dev/null
+++ b/apps/emqx_management/src/emqx_management.appup.src
@@ -0,0 +1,7 @@
+%% -*- mode: erlang -*-
+%% Unless you know what you are doing, DO NOT edit manually!!
+{VSN,
+  [{"5.0.0",[{load_module,emqx_mgmt_cli,brutal_purge,soft_purge,[]}]},
+   {<<".*">>,[]}],
+  [{"5.0.0",[{load_module,emqx_mgmt_cli,brutal_purge,soft_purge,[]}]},
+   {<<".*">>,[]}]}.
diff --git a/apps/emqx_management/src/emqx_mgmt_cli.erl b/apps/emqx_management/src/emqx_mgmt_cli.erl
index ab88c4a09..50f4b21af 100644
--- a/apps/emqx_management/src/emqx_mgmt_cli.erl
+++ b/apps/emqx_management/src/emqx_mgmt_cli.erl
@@ -170,7 +170,7 @@ if_client(ClientId, Fun) ->
 %% @doc Topics Command
 
 topics(["list"]) ->
-    dump(emqx_route);
+    dump(emqx_route, emqx_topic);
 topics(["show", Topic]) ->
     Routes = ets:lookup(emqx_route, bin(Topic)),
     [print({emqx_topic, Route}) || Route <- Routes];
@@ -658,9 +658,6 @@ olp(_) ->
 %% Dump ETS
 %%--------------------------------------------------------------------
 
-dump(Table) ->
-    dump(Table, Table, ets:first(Table), []).
-
 dump(Table, Tag) ->
     dump(Table, Tag, ets:first(Table), []).