From fb97096405a37ac3faf530fc3939f8f20f03dc36 Mon Sep 17 00:00:00 2001
From: Erik Timan <erik.timan@emqx.io>
Date: Tue, 10 Jan 2023 16:48:04 +0100
Subject: [PATCH] fix(mgmt_api): deprecate clientid field instead of removing
 it

---
 apps/emqx_management/i18n/emqx_mgmt_api_publish_i18n.conf | 6 ------
 apps/emqx_management/src/emqx_mgmt_api_publish.erl        | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/emqx_management/i18n/emqx_mgmt_api_publish_i18n.conf b/apps/emqx_management/i18n/emqx_mgmt_api_publish_i18n.conf
index d845bff4b..4ba7e8dba 100644
--- a/apps/emqx_management/i18n/emqx_mgmt_api_publish_i18n.conf
+++ b/apps/emqx_management/i18n/emqx_mgmt_api_publish_i18n.conf
@@ -63,12 +63,6 @@ result of each individual message in the batch.
             zh: "MQTT 消息的 QoS"
         }
     }
-    clientid {
-        desc {
-            en: "Each message can be published as if it is done on behalf of an MQTT client whos ID can be specified in this field."
-            zh: "每个消息都可以带上一个 MQTT 客户端 ID，用于模拟 MQTT 客户端的发布行为。"
-        }
-    }
     payload {
         desc {
             en: "The MQTT message payload."
diff --git a/apps/emqx_management/src/emqx_mgmt_api_publish.erl b/apps/emqx_management/src/emqx_mgmt_api_publish.erl
index b7c48a26a..245b56c1d 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_publish.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_publish.erl
@@ -102,6 +102,10 @@ fields(message) ->
                 required => false,
                 default => 0
             })},
+        {clientid,
+            hoconsc:mk(binary(), #{
+                deprecated => {since, "v5.0.14"}
+            })},
         {payload,
             hoconsc:mk(binary(), #{
                 desc => ?DESC(payload),