Merge pull request #7835 from JimMoen/fix-mongo-require-fields

fix(auth): mongo field `filter` not required and have default value

apps/emqx/src/emqx_tls_lib.erl

@@ -289,7 +289,7 @@ ensure_ssl_files(Dir, SSL, Opts) ->
     RequiredKeys = maps:get(required_keys, Opts, []),
     case ensure_ssl_file_key(SSL, RequiredKeys) of
         ok ->
-            Keys = ?SSL_FILE_OPT_NAMES ++ ?SSL_FILE_OPT_NAMES,
+            Keys = ?SSL_FILE_OPT_NAMES ++ ?SSL_FILE_OPT_NAMES_A,
             ensure_ssl_files(Dir, SSL, Keys, Opts);
         {error, _} = Error ->
             Error

apps/emqx_authn/src/simple_authn/emqx_authn_mongodb.erl

@@ -90,6 +90,10 @@ filter(type) ->
     map();
 filter(desc) ->
     ?DESC(?FUNCTION_NAME);
+filter(required) ->
+    false;
+filter(default) ->
+    #{};
 filter(_) ->
     undefined.
 

apps/emqx_authz/src/emqx_authz_api_schema.erl

@@ -193,6 +193,10 @@ filter(type) ->
     map();
 filter(desc) ->
     ?DESC(?FUNCTION_NAME);
+filter(required) ->
+    false;
+filter(default) ->
+    #{};
 filter(_) ->
     undefined.
 

apps/emqx_authz/src/emqx_authz_schema.erl

@@ -279,7 +279,8 @@ mongo_common_fields() ->
         }},
         {filter, #{
             type => map(),
-            required => true,
+            required => false,
+            default => #{},
             desc => ?DESC(filter)
         }}
     ].