From d76e1eb5f3e2d0f5c48c6daa931331fdba461db7 Mon Sep 17 00:00:00 2001
From: "U-JOHNLIU\\jonhl" <johnliu>
Date: Tue, 4 Jan 2022 14:19:23 +0800
Subject: [PATCH] fix: update dgiot config

---
 apps/dgiot/conf/rebar.config     | 30 +++++++++++++++++++++++-------
 apps/dgiot/conf/rebar.config.erl |  6 ++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/apps/dgiot/conf/rebar.config b/apps/dgiot/conf/rebar.config
index b37f074c..3424c5e5 100644
--- a/apps/dgiot/conf/rebar.config
+++ b/apps/dgiot/conf/rebar.config
@@ -36,13 +36,29 @@
 {erl_first_files, ["src/emqx_logger.erl", "src/emqx_rule_actions_trans.erl"]}.
 
 {deps,
-    [{gun, {git, "https://gitee.com/fastdgiot/gun", {tag, "1.3.5"}}}
-    , {ssl_verify_fun, {git, "https://gitee.com/fastdgiot/ssl_verify_fun.erl.git", {tag, "1.1.4"}}}
-    , {erlydtl, {git, "https://gitee.com/fastdgiot/erlydtl.git", {tag, "0.12.1"}}}
-    , {erlport, {git, "https://gitee.com/fastdgiot/erlport", {tag, "v1.2.2"}}}
-    , {poolboy, {git, "https://gitee.com/fastdgiot/poolboy.git", {tag, "1.5.3"}}}
-    , {ibrowse, {git, "https://gitee.com/fastdgiot/ibrowse.git", {tag, "v4.4.2"}}}
-    , {jwerl, {git, "https://gitee.com/fastdgiot/jwerl.git", {tag, "1.1.1"}}}
+    [
+        {gpb, "4.11.2"} %% gpb only used to build, but not for release, pin it here to avoid fetching a wrong version due to rebar plugins scattered in all the deps
+        , {ehttpc, {git, "https://gitee.com/fastdgiot/ehttpc", {tag, "0.1.14"}}}
+        , {eredis_cluster, {git, "https://gitee.com/fastdgiot/eredis_cluster", {tag, "0.6.5"}}}
+        , {gproc, {git, "https://gitee.com/fastdgiot/gproc", {tag, "0.8.0"}}}
+        , {jiffy, {git, "https://gitee.com/fastdgiot/jiffy", {tag, "1.0.5"}}}
+        , {cowboy, {git, "https://gitee.com/fastdgiot/cowboy", {tag, "2.8.2"}}}
+        , {esockd, {git, "https://gitee.com/fastdgiot/esockd", {tag, "5.8.0"}}}
+        , {ekka, {git, "https://gitee.com/fastdgiot/ekka", {tag, "0.8.1.7"}}}
+        , {gen_rpc, {git, "https://gitee.com/fastdgiot/gen_rpc", {tag, "2.5.1"}}}
+        , {cuttlefish, {git, "https://gitee.com/fastdgiot/cuttlefish", {tag, "v4.3.4"}}}
+        , {minirest, {git, "https://gitee.com/fastdgiot/minirest", {tag, "0.3.7"}}}
+        , {ecpool, {git, "https://gitee.com/fastdgiot/ecpool", {tag, "0.5.2"}}}
+        , {replayq, {git, "https://gitee.com/fastdgiot/replayq", {tag, "0.3.2"}}}
+        , {pbkdf2, {git, "https://gitee.com/fastdgiot/erlang-pbkdf2.git", {branch, "2.0.4"}}}
+        , {emqtt, {git, "https://gitee.com/fastdgiot/emqtt", {tag, "1.2.3.1"}}}
+        , {rulesql, {git, "https://gitee.com/fastdgiot/rulesql", {tag, "0.1.2"}}}
+        , {recon, {git, "https://gitee.com/fastdgiot/recon", {tag, "2.5.1"}}}
+        , {observer_cli, "1.6.1"} % NOTE: depends on recon 2.5.1
+        , {getopt, "1.0.1"}
+        , {snabbkaffe, {git, "https://gitee.com/fastdgiot/snabbkaffe.git", {tag, "0.12.2"}}}
+        , {ejdbc, {git, "https://gitee.com/fastdgiot/ejdbc", {tag, "1.0.1"}}}
+        , {gun, {git, "https://gitee.com/fastdgiot/gun", {tag, "1.3.5"}}}
     ]}.
 
 {xref_ignores,
diff --git a/apps/dgiot/conf/rebar.config.erl b/apps/dgiot/conf/rebar.config.erl
index 0a7c81de..65e509b7 100644
--- a/apps/dgiot/conf/rebar.config.erl
+++ b/apps/dgiot/conf/rebar.config.erl
@@ -200,6 +200,7 @@ overlay_vars_rel(RelType) ->
         , {enable_plugin_emqx_retainer, true}
         , {enable_plugin_emqx_telemetry, true}
         , {enable_plugin_emqx_exhook, true}
+       , {enable_plugin_emqx_auth_mnesia, true}
         , {enable_plugin_dgiot, true}
         , {enable_plugin_dgiot_bridge, true}
         , {enable_plugin_dgiot_parse, true}
@@ -222,6 +223,7 @@ overlay_vars_rel(RelType) ->
         , {enable_plugin_dgiot_gb26875, true}
         , {enable_plugin_dgiot_mqtt, true}
         , {enable_plugin_dgiot_iq60, true}
+        , {enable_plugin_dgiot_location, true}
         , {vm_args_file, VmArgs}
     ].
 
@@ -273,6 +275,7 @@ relx_apps(ReleaseType) ->
         , jsx
         , jesse
         , jwerl
+        , locus
         , odbc
         , erlydtl
         , ejdbc
@@ -320,6 +323,7 @@ relx_plugin_apps(ReleaseType) ->
         , emqx_rule_engine
         , emqx_sasl
         , emqx_exhook
+       , emqx_auth_mnesia
     ]
     ++ [emqx_telemetry || not is_enterprise()]
         ++ relx_plugin_apps_per_rel(ReleaseType)
@@ -333,6 +337,7 @@ relx_plugin_apps_per_rel(cloud) ->
         , emqx_exproto
         , emqx_prometheus
         , emqx_psk_file
+        , emqx_auth_mnesia
         , dgiot
         , dgiot_parse
         , dgiot_api
@@ -355,6 +360,7 @@ relx_plugin_apps_per_rel(cloud) ->
         , dgiot_gb26875
         , dgiot_mqtt
         , dgiot_iq60
+        , dgiot_location
     ];
 relx_plugin_apps_per_rel(edge) ->
     [].