From 65efa2672e97516069da276e85f604aef2ff8e18 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 13 Nov 2023 08:59:22 +0100
Subject: [PATCH] test(schema): delete stale reference to emqx_schema:file()
 type

---
 apps/emqx/src/emqx_schema.erl                          |  2 --
 apps/emqx_conf/src/emqx_conf.erl                       |  2 --
 .../test/emqx_swagger_requestBody_SUITE.erl            |  2 +-
 .../test/emqx_swagger_response_SUITE.erl               | 10 +++++-----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 1a617c6c8..3ad03c4d4 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -47,7 +47,6 @@
 -type bytesize() :: integer().
 -type wordsize() :: bytesize().
 -type percent() :: float().
--type file() :: string().
 -type comma_separated_list() :: list(string()).
 -type comma_separated_binary() :: [binary()].
 -type comma_separated_atoms() :: [atom()].
@@ -151,7 +150,6 @@
     bytesize/0,
     wordsize/0,
     percent/0,
-    file/0,
     comma_separated_list/0,
     comma_separated_binary/0,
     ip_port/0,
diff --git a/apps/emqx_conf/src/emqx_conf.erl b/apps/emqx_conf/src/emqx_conf.erl
index 6f50cf831..8b51c2161 100644
--- a/apps/emqx_conf/src/emqx_conf.erl
+++ b/apps/emqx_conf/src/emqx_conf.erl
@@ -337,8 +337,6 @@ typename_to_spec("timeout_duration_ms()", _Mod) ->
     #{type => duration};
 typename_to_spec("percent()", _Mod) ->
     #{type => percent};
-typename_to_spec("file()", _Mod) ->
-    #{type => string};
 typename_to_spec("ip_port()", _Mod) ->
     #{type => ip_port};
 typename_to_spec("url()", _Mod) ->
diff --git a/apps/emqx_dashboard/test/emqx_swagger_requestBody_SUITE.erl b/apps/emqx_dashboard/test/emqx_swagger_requestBody_SUITE.erl
index 2457cd56a..b5c55622b 100644
--- a/apps/emqx_dashboard/test/emqx_swagger_requestBody_SUITE.erl
+++ b/apps/emqx_dashboard/test/emqx_swagger_requestBody_SUITE.erl
@@ -816,7 +816,7 @@ to_schema(Body) ->
 fields(good_ref) ->
     [
         {'webhook-host', mk(emqx_schema:ip_port(), #{default => <<"127.0.0.1:80">>})},
-        {log_dir, mk(emqx_schema:file(), #{example => "var/log/emqx"})},
+        {log_dir, mk(string(), #{example => "var/log/emqx"})},
         {tag, mk(binary(), #{desc => <<"tag">>})}
     ];
 fields(nest_ref) ->
diff --git a/apps/emqx_dashboard/test/emqx_swagger_response_SUITE.erl b/apps/emqx_dashboard/test/emqx_swagger_response_SUITE.erl
index 376ace5c2..745db76f0 100644
--- a/apps/emqx_dashboard/test/emqx_swagger_response_SUITE.erl
+++ b/apps/emqx_dashboard/test/emqx_swagger_response_SUITE.erl
@@ -344,10 +344,9 @@ t_complex_type(_Config) ->
                 enum := [random, hash], type := string
             }},
             {<<"timeout">>, #{
-                example := infinity,
                 <<"oneOf">> := [
-                    #{example := infinity, type := string},
-                    #{type := integer}
+                    #{example := _, type := string},
+                    #{enum := [infinity], type := string}
                 ]
             }},
             {<<"bytesize">>, #{
@@ -653,7 +652,8 @@ schema("/ref/complex_type") ->
                     {server, hoconsc:mk(emqx_schema:ip_port(), #{})},
                     {connect_timeout, hoconsc:mk(emqx_schema:timeout_duration(), #{})},
                     {pool_type, hoconsc:mk(hoconsc:enum([random, hash]), #{})},
-                    {timeout, hoconsc:mk(timeout(), #{})},
+                    {timeout,
+                        hoconsc:mk(hoconsc:union([infinity, emqx_schema:timeout_duration()]), #{})},
                     {bytesize, hoconsc:mk(emqx_schema:bytesize(), #{})},
                     {wordsize, hoconsc:mk(emqx_schema:wordsize(), #{})},
                     {maps, hoconsc:mk(map(), #{})},
@@ -687,7 +687,7 @@ to_schema(Object) ->
 fields(good_ref) ->
     [
         {'webhook-host', mk(emqx_schema:ip_port(), #{default => <<"127.0.0.1:80">>})},
-        {log_dir, mk(emqx_schema:file(), #{example => "var/log/emqx"})},
+        {log_dir, mk(string(), #{example => "var/log/emqx"})},
         {tag, mk(binary(), #{desc => <<"tag">>})}
     ];
 fields(nest_ref) ->