From 3482c2c849d831d51ce4dca9d1b049b1de8b6f8d Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Fri, 19 May 2023 19:47:22 +0200
Subject: [PATCH] refactor: redefine default value for 'node.applications' in
 enterprise

---
 apps/emqx_conf/src/emqx_conf_schema.erl       |  2 +-
 lib-ee/emqx_ee_conf/src/emqx_ee_conf.app.src  |  2 +-
 .../emqx_ee_conf/src/emqx_ee_conf_schema.erl  | 38 ++++++++++++++++---
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index 97efa67cc..6adb456ca 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -560,7 +560,7 @@ fields("node") ->
                 emqx_schema:comma_separated_atoms(),
                 #{
                     mapping => "emqx_machine.applications",
-                    default => [],
+                    default => <<"">>,
                     'readOnly' => true,
                     importance => ?IMPORTANCE_HIDDEN,
                     desc => ?DESC(node_applications)
diff --git a/lib-ee/emqx_ee_conf/src/emqx_ee_conf.app.src b/lib-ee/emqx_ee_conf/src/emqx_ee_conf.app.src
index 3df18ce7a..599b0798c 100644
--- a/lib-ee/emqx_ee_conf/src/emqx_ee_conf.app.src
+++ b/lib-ee/emqx_ee_conf/src/emqx_ee_conf.app.src
@@ -1,6 +1,6 @@
 {application, emqx_ee_conf, [
     {description, "EMQX Enterprise Edition configuration schema"},
-    {vsn, "0.1.2"},
+    {vsn, "0.1.3"},
     {registered, []},
     {applications, [
         kernel,
diff --git a/lib-ee/emqx_ee_conf/src/emqx_ee_conf_schema.erl b/lib-ee/emqx_ee_conf/src/emqx_ee_conf_schema.erl
index c1b1a002c..c407836fb 100644
--- a/lib-ee/emqx_ee_conf/src/emqx_ee_conf_schema.erl
+++ b/lib-ee/emqx_ee_conf/src/emqx_ee_conf_schema.erl
@@ -14,14 +14,18 @@ namespace() ->
     emqx_conf_schema:namespace().
 
 roots() ->
-    lists:foldl(
-        fun(Module, Roots) ->
-            Roots ++ apply(Module, roots, [])
-        end,
-        emqx_conf_schema:roots(),
-        ?EE_SCHEMA_MODULES
+    redefine_roots(
+        lists:foldl(
+            fun(Module, Roots) ->
+                Roots ++ apply(Module, roots, [])
+            end,
+            emqx_conf_schema:roots(),
+            ?EE_SCHEMA_MODULES
+        )
     ).
 
+fields("node") ->
+    redefine_node(emqx_conf_schema:fields("node"));
 fields(Name) ->
     emqx_conf_schema:fields(Name).
 
@@ -33,3 +37,25 @@ translation(Name) ->
 
 validations() ->
     emqx_conf_schema:validations().
+
+redefine_node(Fields) ->
+    Overrides = [{"applications", #{default => <<"emqx_license">>}}],
+    override(Fields, Overrides).
+
+redefine_roots(Roots) ->
+    Overrides = [{"node", #{type => hoconsc:ref(?MODULE, "node")}}],
+    override(Roots, Overrides).
+
+override(Fields, []) ->
+    Fields;
+override(Fields, [{Name, Override}]) ->
+    Schema = find_schema(Name, Fields),
+    NewSchema = hocon_schema:override(Schema, Override),
+    replace_schema(Name, NewSchema, Fields).
+
+find_schema(Name, Fields) ->
+    {Name, Schema} = lists:keyfind(Name, 1, Fields),
+    Schema.
+
+replace_schema(Name, Schema, Fields) ->
+    lists:keyreplace(Name, 1, Fields, {Name, Schema}).