From e3a5f65c88c3b5b370533077f11a785338d7a6f0 Mon Sep 17 00:00:00 2001
From: Yudai Kiyofuji <57182816+z8674558@users.noreply.github.com>
Date: Fri, 9 Apr 2021 14:28:01 +0000
Subject: [PATCH] feat(config): print override env (#4517)

---
 bin/emqx             | 7 ++++++-
 rebar.config         | 2 +-
 src/emqx_plugins.erl | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/emqx b/bin/emqx
index e7c809ad2..0a64313f1 100755
--- a/bin/emqx
+++ b/bin/emqx
@@ -213,8 +213,13 @@ generate_config() {
         if [ "${EMQX_LICENSE_CONF:-}" != "" ]; then
             EMQX_LICENSE_CONF_OPTION="-i ${EMQX_LICENSE_CONF}"
         fi
+
         # shellcheck disable=SC2086
-        CONFIG_ARGS=$("$ERTS_PATH"/escript "$RUNNER_ROOT_DIR"/bin/cuttlefish -i "$REL_DIR"/emqx.schema $EMQX_LICENSE_CONF_OPTION -c "$RUNNER_ETC_DIR"/emqx.conf -d "$RUNNER_DATA_DIR"/configs generate)
+        CONFIG="$("$ERTS_PATH"/escript "$RUNNER_ROOT_DIR"/bin/cuttlefish -v -i "$REL_DIR"/emqx.schema $EMQX_LICENSE_CONF_OPTION -c "$RUNNER_ETC_DIR"/emqx.conf -d "$RUNNER_DATA_DIR"/configs generate)"
+        # print override from environment variables (EMQX_*)
+        echo "$CONFIG" | sed -e '$d'
+        CONFIG_ARGS=$(echo "$CONFIG" | tail -n 1)
+
 
         ## Merge cuttlefish generated *.args into the vm.args
         CUTTLE_GEN_ARG_FILE=$(echo "$CONFIG_ARGS" | sed -n 's/^.*\(vm_args[[:space:]]\)//p' | awk '{print $1}')
diff --git a/rebar.config b/rebar.config
index bc5518682..ed7a6af15 100644
--- a/rebar.config
+++ b/rebar.config
@@ -42,7 +42,7 @@
     , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}}
     , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.8.0"}}}
     , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.0"}}}
-    , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.2.1"}}}
+    , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.3.0"}}}
     , {minirest, {git, "https://github.com/emqx/minirest", {tag, "0.3.5"}}}
     , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.0"}}}
     , {replayq, {git, "https://github.com/emqx/replayq", {tag, "0.3.2"}}}
diff --git a/src/emqx_plugins.erl b/src/emqx_plugins.erl
index 878c3432b..5a074d5b3 100644
--- a/src/emqx_plugins.erl
+++ b/src/emqx_plugins.erl
@@ -232,7 +232,8 @@ generate_configs(App) ->
         {_, true} ->
             Schema = cuttlefish_schema:files([SchemaFile]),
             Conf = cuttlefish_conf:file(ConfFile),
-            cuttlefish_generator:map(Schema, Conf);
+            LogFun = fun(Key, Value) -> ?LOG(info, "~s = ~p", [string:join(Key, "."), Value]) end,
+            cuttlefish_generator:map(Schema, Conf, undefined, LogFun);
         {false, false} ->
             error({config_not_found, {ConfigFile, ConfFile, SchemaFile}})
     end.