yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6950 from terry-xiaoyu/remove_extra_spaces 

fix: format the code to remove extra spaces
This commit is contained in:
Shawn 2022-02-10 09:35:18 +08:00 committed by GitHub
parent e861f3963e 81edbd232d
commit fd87bce8f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 185 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqx_authn/src/simple_authn/emqx_authn_http.erl
View File

@ -50,14 +50,12 @@ roots() ->
]. ].
fields(get) -> fields(get) ->
[ {method, #{type => get, [ {method, #{type => get, default => post}}
default => post}}
, {headers, fun headers_no_content_type/1} , {headers, fun headers_no_content_type/1}
] ++ common_fields(); ] ++ common_fields();
fields(post) -> fields(post) ->
[ {method, #{type => post, [ {method, #{type => post, default => post}}
default => post}}
, {headers, fun headers/1} , {headers, fun headers/1}
] ++ common_fields(). ] ++ common_fields().

3
apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl
View File

@ -64,8 +64,7 @@ fields('jwks') ->
[ {use_jwks, {enum, [true]}} [ {use_jwks, {enum, [true]}}
, {endpoint, fun endpoint/1} , {endpoint, fun endpoint/1}
, {refresh_interval, fun refresh_interval/1} , {refresh_interval, fun refresh_interval/1}
, {ssl, #{type => hoconsc:union( , {ssl, #{type => hoconsc:union([ hoconsc:ref(?MODULE, ssl_enable)
[ hoconsc:ref(?MODULE, ssl_enable)
, hoconsc:ref(?MODULE, ssl_disable) , hoconsc:ref(?MODULE, ssl_disable)
]), ]),
default => #{<<"enable">> => false}}} default => #{<<"enable">> => false}}}

40
apps/emqx_authz/src/emqx_authz_api_mnesia.erl
View File

@ -222,24 +222,36 @@ schema("/authorization/sources/built-in-database/purge-all") ->
}. }.
fields(rule_item) -> fields(rule_item) ->
[ {topic, hoconsc:mk( string() [ {topic, hoconsc:mk(string(),
, #{ required => true #{ required => true
, desc => <<"Rule on specific topic">> , desc => <<"Rule on specific topic">>
, example => <<"test/topic/1">>})} , example => <<"test/topic/1">>
, {permission, hoconsc:mk( hoconsc:enum([allow, deny]) })}
, #{desc => <<"Permission">>, required => true, example => allow})} , {permission, hoconsc:mk(hoconsc:enum([allow, deny]),
, {action, hoconsc:mk( hoconsc:enum([publish, subscribe, all]) #{ desc => <<"Permission">>
, #{ required => true, example => publish , required => true
, desc => <<"Authorized action">> })} ]; , example => allow
})}
, {action, hoconsc:mk(hoconsc:enum([publish, subscribe, all]),
#{ required => true
, example => publish
, desc => <<"Authorized action">>
})}
];
fields(clientid) -> fields(clientid) ->
[ {clientid, hoconsc:mk( binary() [ {clientid, hoconsc:mk(binary(),
, #{ in => path, required => true #{ in => path
, desc => <<"ClientID">>, example => <<"client1">>})} , required => true
, desc => <<"ClientID">>
, example => <<"client1">>
})}
]; ];
fields(username) -> fields(username) ->
[ {username, hoconsc:mk( binary() [ {username, hoconsc:mk(binary(),
, #{ in => path, required => true #{ in => path
, desc => <<"Username">>, example => <<"user1">>})} , required => true
, desc => <<"Username">>
, example => <<"user1">>})}
]; ];
fields(rules_for_username) -> fields(rules_for_username) ->
[ {rules, hoconsc:mk(hoconsc:array(hoconsc:ref(rule_item)), #{})} [ {rules, hoconsc:mk(hoconsc:array(hoconsc:ref(rule_item)), #{})}

11
apps/emqx_authz/src/emqx_authz_sup.erl
View File

@ -32,20 +32,9 @@
start_link() -> start_link() ->
supervisor:start_link({local, ?SERVER}, ?MODULE, []). supervisor:start_link({local, ?SERVER}, ?MODULE, []).
%% sup_flags() = #{strategy => strategy(), % optional
%% intensity => non_neg_integer(), % optional
%% period => pos_integer()} % optional
%% child_spec() = #{id => child_id(), % mandatory
%% start => mfargs(), % mandatory
%% restart => restart(), % optional
%% shutdown => shutdown(), % optional
%% type => worker(), % optional
%% modules => modules()} % optional
init([]) -> init([]) ->
SupFlags = #{strategy => one_for_all, SupFlags = #{strategy => one_for_all,
intensity => 0, intensity => 0,
period => 1}, period => 1},
ChildSpecs = [], ChildSpecs = [],
{ok, {SupFlags, ChildSpecs}}. {ok, {SupFlags, ChildSpecs}}.
%% internal functions

126
apps/emqx_modules/src/emqx_topic_metrics_api.erl
View File

@ -146,60 +146,78 @@ fields(topic_metrics) ->
]; ];
fields(metrics) -> fields(metrics) ->
[ { 'messages.dropped.count' [ {'messages.dropped.count', mk(integer(),
, mk( integer(), #{ desc => <<"Message dropped count">> #{ desc => <<"Message dropped count">>
, example => 0})}, , example => 0
{ 'messages.dropped.rate' })}
, mk( number(), #{ desc => <<"Message dropped rate in 5s">> , {'messages.dropped.rate', mk(number(),
, example => 0})}, #{ desc => <<"Message dropped rate in 5s">>
{ 'messages.in.count' , example => 0
, mk( integer(), #{ desc => <<"Message received count">> })}
, example => 0})}, , {'messages.in.count', mk(integer(),
{ 'messages.in.rate' #{ desc => <<"Message received count">>
, mk( number(), #{ desc => <<"Message received rate in 5s">> , example => 0
, example => 0})}, })}
{ 'messages.out.count' , {'messages.in.rate', mk(number(),
, mk( integer(), #{ desc => <<"Message sent count">> #{ desc => <<"Message received rate in 5s">>
, example => 0})}, , example => 0
{ 'messages.out.rate' })}
, mk( number(), #{ desc => <<"Message sent rate in 5s">> , {'messages.out.count', mk(integer(),
, example => 0})}, #{ desc => <<"Message sent count">>
{ 'messages.qos0.in.count' , example => 0
, mk( integer(), #{ desc => <<"Message with QoS 0 received count">> })}
, example => 0})}, , {'messages.out.rate', mk(number(),
{ 'messages.qos0.in.rate' #{ desc => <<"Message sent rate in 5s">>
, mk( number(), #{ desc => <<"Message with QoS 0 received rate in 5s">> , example => 0
, example => 0})}, })}
{ 'messages.qos0.out.count' , {'messages.qos0.in.count', mk(integer(),
, mk( integer(), #{ desc => <<"Message with QoS 0 sent count">> #{ desc => <<"Message with QoS 0 received count">>
, example => 0})}, , example => 0
{ 'messages.qos0.out.rate' })}
, mk( number(), #{ desc => <<"Message with QoS 0 sent rate in 5s">> , {'messages.qos0.in.rate', mk(number(),
, example => 0})}, #{ desc => <<"Message with QoS 0 received rate in 5s">>
{ 'messages.qos1.in.count' , example => 0
, mk( integer(), #{ desc => <<"Message with QoS 1 received count">> })}
, example => 0})}, , {'messages.qos0.out.count', mk(integer(),
{ 'messages.qos1.in.rate' #{ desc => <<"Message with QoS 0 sent count">>
, mk( number(), #{ desc => <<"Message with QoS 1 received rate in 5s">> , example => 0
, example => 0})}, })}
{ 'messages.qos1.out.count' , {'messages.qos0.out.rate', mk(number(),
, mk( integer(), #{ desc => <<"Message with QoS 1 sent count">> #{ desc => <<"Message with QoS 0 sent rate in 5s">>
, example => 0})}, , example => 0
{ 'messages.qos1.out.rate' })}
, mk( number(), #{ desc => <<"Message with QoS 1 sent rate in 5s">> , {'messages.qos1.in.count', mk(integer(),
, example => 0})}, #{ desc => <<"Message with QoS 1 received count">>
{ 'messages.qos2.in.count' , example => 0
, mk( integer(), #{ desc => <<"Message with QoS 2 sent count">> })}
, example => 0})}, , {'messages.qos1.in.rate', mk(number(),
{ 'messages.qos2.in.rate' #{ desc => <<"Message with QoS 1 received rate in 5s">>
, mk( number(), #{ desc => <<"Message with QoS 2 received rate in 5s">> , example => 0
, example => 0})}, })}
{ 'messages.qos2.out.count' , {'messages.qos1.out.count', mk(integer(),
, mk( integer(), #{ desc => <<"Message with QoS 2 sent count">> #{ desc => <<"Message with QoS 1 sent count">>
, example => 0})}, , example => 0
{ 'messages.qos2.out.rate' })}
, mk( number(), #{ desc => <<"Message with QoS 2 sent rate in 5s">> , {'messages.qos1.out.rate', mk(number(),
, example => 0})} #{ desc => <<"Message with QoS 1 sent rate in 5s">>
, example => 0
})}
, {'messages.qos2.in.count', mk(integer(),
#{ desc => <<"Message with QoS 2 sent count">>
, example => 0
})}
, {'messages.qos2.in.rate', mk(number(),
#{ desc => <<"Message with QoS 2 received rate in 5s">>
, example => 0
})}
, {'messages.qos2.out.count', mk(integer(),
#{ desc => <<"Message with QoS 2 sent count">>
, example => 0
})}
, {'messages.qos2.out.rate', mk(number(),
#{ desc => <<"Message with QoS 2 sent rate in 5s">>
, example => 0
})}
]. ].
topic(In) -> topic(In) ->

2
deploy/docker/README.md
View File

@ -10,7 +10,7 @@
+ **Supported architectures** + **Supported architectures**
`amd64`, `arm64v8`, `arm32v7`, `i386`, `s390x` `amd64`, `arm64v8`
+ **Supported Docker versions**: + **Supported Docker versions**: