From 95cc5a19c856544e107eb92996818a8b01b5be98 Mon Sep 17 00:00:00 2001
From: DDDHuang <44492639+DDDHuang@users.noreply.github.com>
Date: Tue, 15 Mar 2022 21:57:51 +0800
Subject: [PATCH] fix: bad list & bad SUITE

---
 apps/emqx_management/src/emqx_mgmt_api_data.erl        |  2 +-
 .../test/emqx_auth_mnesia_migration_SUITE.erl          |  5 ++++-
 .../test/emqx_bridge_mqtt_data_export_import_SUITE.erl | 10 +++++++---
 apps/emqx_management/test/emqx_mgmt_api_SUITE.erl      |  3 ++-
 .../test/emqx_webhook_data_export_import_SUITE.erl     |  7 +++++--
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/apps/emqx_management/src/emqx_mgmt_api_data.erl b/apps/emqx_management/src/emqx_mgmt_api_data.erl
index e9a00907b..93d5498f1 100644
--- a/apps/emqx_management/src/emqx_mgmt_api_data.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api_data.erl
@@ -160,4 +160,4 @@ import_content(Content) ->
 tmp_filename() ->
     Seconds = erlang:system_time(second),
     {{Y, M, D}, {H, MM, S}} = emqx_mgmt_util:datetime(Seconds),
-    io_lib:format("emqx-export-~p-~p-~p-~p-~p-~p.json", [Y, M, D, H, MM, S]).
+    list_to_binary(io_lib:format("emqx-export-~p-~p-~p-~p-~p-~p.json", [Y, M, D, H, MM, S])).
diff --git a/apps/emqx_management/test/emqx_auth_mnesia_migration_SUITE.erl b/apps/emqx_management/test/emqx_auth_mnesia_migration_SUITE.erl
index 19ec8d61e..313f7767b 100644
--- a/apps/emqx_management/test/emqx_auth_mnesia_migration_SUITE.erl
+++ b/apps/emqx_management/test/emqx_auth_mnesia_migration_SUITE.erl
@@ -183,7 +183,10 @@ do_import(File, Config, Overrides) ->
     mnesia:clear_table(?ACL_TABLE2),
     mnesia:clear_table(emqx_user),
     emqx_acl_mnesia_migrator:migrate_records(),
-    Filename = filename:join(proplists:get_value(data_dir, Config), File),
+    Filename = filename:basename(File),
+    FilePath = filename:join([proplists:get_value(data_dir, Config), File]),
+    {ok, Bin} = file:read_file(FilePath),
+    ok = emqx_mgmt_data_backup:upload_backup_file(Filename, Bin),
     emqx_mgmt_data_backup:import(Filename, Overrides).
 
 test_import(username, {Username, Password}) ->
diff --git a/apps/emqx_management/test/emqx_bridge_mqtt_data_export_import_SUITE.erl b/apps/emqx_management/test/emqx_bridge_mqtt_data_export_import_SUITE.erl
index bae633045..11ee96d4f 100644
--- a/apps/emqx_management/test/emqx_bridge_mqtt_data_export_import_SUITE.erl
+++ b/apps/emqx_management/test/emqx_bridge_mqtt_data_export_import_SUITE.erl
@@ -34,14 +34,18 @@ init_per_suite(Cfg) ->
     Cfg.
 
 end_per_suite(Cfg) ->
+    emqx_mgmt_data_backup:delete_all_backup_file(),
     emqx_ct_helpers:stop_apps([emqx_management, emqx_rule_engine]),
     Cfg.
 
 get_data_path() ->
     emqx_ct_helpers:deps_path(emqx_management, "test/emqx_bridge_mqtt_data_export_import_SUITE_data/").
 
-import(FilePath, Version) ->
-    ok = emqx_mgmt_data_backup:import(get_data_path() ++ "/" ++ FilePath, <<"{}">>),
+import(FilePath0, Version) ->
+    Filename = filename:basename(FilePath0),
+    FilePath = filename:join([get_data_path(), FilePath0]),
+    {ok, Bin} = file:read_file(FilePath),
+    ok = emqx_mgmt_data_backup:upload_backup_file(Filename, Bin),
     timer:sleep(500),
     lists:foreach(fun(#resource{id = Id, config = Config} = _Resource) ->
         case Id of
@@ -181,4 +185,4 @@ remove_resources() ->
     lists:foreach(fun(#resource{id = Id}) ->
         emqx_rule_engine:delete_resource(Id)
     end, emqx_rule_registry:get_resources()),
-    timer:sleep(500).
\ No newline at end of file
+    timer:sleep(500).
diff --git a/apps/emqx_management/test/emqx_mgmt_api_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_SUITE.erl
index 5631e5b78..27d3a2cbf 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_SUITE.erl
@@ -719,9 +719,10 @@ t_data_import_content(_) ->
     Dir = emqx_mgmt_data_backup:backup_dir(),
     {ok, Bin} = file:read_file(filename:join(Dir, Filename)),
     Content = emqx_json:decode(Bin),
+    ct:pal("Content:::: ~p~n", [Content]),
     ?assertMatch({ok, "{\"code\":0}"},
         request_api(post, api_path(["data","import"]), [], auth_header_(), Content)),
-    
+
     emqx_mgmt_data_backup:delete_all_backup_file(),
     application:stop(emqx_rule_engine),
     application:stop(emqx_dashboard).
diff --git a/apps/emqx_management/test/emqx_webhook_data_export_import_SUITE.erl b/apps/emqx_management/test/emqx_webhook_data_export_import_SUITE.erl
index 2965b7ad0..e22222e4c 100644
--- a/apps/emqx_management/test/emqx_webhook_data_export_import_SUITE.erl
+++ b/apps/emqx_management/test/emqx_webhook_data_export_import_SUITE.erl
@@ -46,8 +46,11 @@ remove_resource(Id) ->
     emqx_rule_registry:remove_resource(Id),
     emqx_rule_registry:remove_resource_params(Id).
 
-import(FilePath, Version) ->
-    ok = emqx_mgmt_data_backup:import(get_data_path() ++ "/" ++ FilePath, <<"{}">>),
+import(FilePath0, Version) ->
+    Filename = filename:basename(FilePath0),
+    FilePath = filename:join([get_data_path(), FilePath0]),
+    {ok, Bin} = file:read_file(FilePath),
+    ok = emqx_mgmt_data_backup:upload_backup_file(Filename, Bin),
     lists:foreach(fun(#resource{id = Id, config = Config} = _Resource) ->
         case Id of
             <<"webhook">> ->