From fab9ad91de2d4a30a5b8957814c0181cfb6bbcaa Mon Sep 17 00:00:00 2001 From: JimMoen Date: Thu, 3 Mar 2022 10:59:01 +0800 Subject: [PATCH] fix(schema): nullable => required --- apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl | 4 ++-- apps/emqx_prometheus/src/emqx_prometheus_schema.erl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl b/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl index d4541f49d..c7a5af24a 100644 --- a/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl +++ b/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl @@ -74,8 +74,8 @@ fields(limiter) -> ]; fields(limiter_opts) -> - [ {global, sc(ref(rate_burst), #{nuallabe => true})} - , {zone, sc(map("zone name", ref(rate_burst)), #{nullable => true})} + [ {global, sc(ref(rate_burst), #{required => false})} + , {zone, sc(map("zone name", ref(rate_burst)), #{required => false})} , {bucket, sc(map("bucket_id", ref(bucket)), #{desc => "Token bucket"})} ]; diff --git a/apps/emqx_prometheus/src/emqx_prometheus_schema.erl b/apps/emqx_prometheus/src/emqx_prometheus_schema.erl index 9d7455bdf..17387e06d 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus_schema.erl +++ b/apps/emqx_prometheus/src/emqx_prometheus_schema.erl @@ -28,9 +28,9 @@ namespace() -> "prometheus". roots() -> ["prometheus"]. fields("prometheus") -> - [ {push_gateway_server, sc(string(), #{default => "http://127.0.0.1:9091", nullabel => false})} - , {interval, sc(emqx_schema:duration_ms(), #{default => "15s", nullabel => false})} - , {enable, sc(boolean(), #{default => false, nullabel => false})} + [ {push_gateway_server, sc(string(), #{default => "http://127.0.0.1:9091", required => true})} + , {interval, sc(emqx_schema:duration_ms(), #{default => "15s", required => true})} + , {enable, sc(boolean(), #{default => false, required => true})} ]. sc(Type, Meta) -> hoconsc:mk(Type, Meta).