diff --git a/apps/emqx_enterprise/src/emqx_enterprise.app.src b/apps/emqx_enterprise/src/emqx_enterprise.app.src index 37c74bdec..ac35da5b9 100644 --- a/apps/emqx_enterprise/src/emqx_enterprise.app.src +++ b/apps/emqx_enterprise/src/emqx_enterprise.app.src @@ -1,6 +1,6 @@ {application, emqx_enterprise, [ {description, "EMQX Enterprise Edition"}, - {vsn, "0.1.1"}, + {vsn, "0.1.2"}, {registered, []}, {applications, [ kernel, diff --git a/apps/emqx_enterprise/src/emqx_enterprise_schema.erl b/apps/emqx_enterprise/src/emqx_enterprise_schema.erl index 67e8a9c9a..5da65e2f5 100644 --- a/apps/emqx_enterprise/src/emqx_enterprise_schema.erl +++ b/apps/emqx_enterprise/src/emqx_enterprise_schema.erl @@ -35,7 +35,7 @@ desc(Name) -> ee_delegate(desc, ?EE_SCHEMA_MODULES, Name). validations() -> - emqx_conf_schema:validations(). + emqx_conf_schema:validations() ++ emqx_license_schema:validations(). %%------------------------------------------------------------------------------ %% helpers diff --git a/lib-ee/emqx_license/test/emqx_license_http_api_SUITE.erl b/lib-ee/emqx_license/test/emqx_license_http_api_SUITE.erl index 1b4a2ad2d..0de91c6d4 100644 --- a/lib-ee/emqx_license/test/emqx_license_http_api_SUITE.erl +++ b/lib-ee/emqx_license/test/emqx_license_http_api_SUITE.erl @@ -193,6 +193,22 @@ t_license_setting(_Config) -> validate_setting(UpdateRes, Low, High), ?assertEqual(0.5, emqx_config:get([license, connection_low_watermark])), ?assertEqual(0.55, emqx_config:get([license, connection_high_watermark])), + + %% update bad setting low >= high + ?assertMatch( + {ok, 400, _}, + request(post, uri(["license", "setting"]), #{ + <<"connection_low_watermark">> => <<"50%">>, + <<"connection_high_watermark">> => <<"50%">> + }) + ), + ?assertMatch( + {ok, 400, _}, + request(post, uri(["license", "setting"]), #{ + <<"connection_low_watermark">> => <<"51%">>, + <<"connection_high_watermark">> => <<"50%">> + }) + ), ok. validate_setting(Res, ExpectLow, ExpectHigh) ->