fix(emqx_bridge): small fixes from review
This commit is contained in:
parent
7a17fb7308
commit
c3133fb6a2
|
@ -2,8 +2,8 @@ emqx_bridge_api {
|
||||||
|
|
||||||
desc_param_path_operation_cluster {
|
desc_param_path_operation_cluster {
|
||||||
desc {
|
desc {
|
||||||
en: """Operations can be one of: start, stop, restart"""
|
en: """Operations can be one of: stop, restart"""
|
||||||
zh: """集群可用操作:启用、启动、重新启动"""
|
zh: """集群可用操作:停止、重新启动"""
|
||||||
}
|
}
|
||||||
label: {
|
label: {
|
||||||
en: "Cluster Operation"
|
en: "Cluster Operation"
|
||||||
|
|
|
@ -107,7 +107,7 @@ param_path_operation_on_node() ->
|
||||||
#{
|
#{
|
||||||
in => path,
|
in => path,
|
||||||
required => true,
|
required => true,
|
||||||
example => <<"start">>,
|
example => <<"stop">>,
|
||||||
desc => ?DESC("desc_param_path_operation_on_node")
|
desc => ?DESC("desc_param_path_operation_on_node")
|
||||||
}
|
}
|
||||||
)}.
|
)}.
|
||||||
|
@ -142,6 +142,7 @@ param_path_enable() ->
|
||||||
boolean(),
|
boolean(),
|
||||||
#{
|
#{
|
||||||
in => path,
|
in => path,
|
||||||
|
required => true,
|
||||||
desc => ?DESC("desc_param_path_enable"),
|
desc => ?DESC("desc_param_path_enable"),
|
||||||
example => true
|
example => true
|
||||||
}
|
}
|
||||||
|
|
|
@ -616,7 +616,6 @@ t_metrics(Config) ->
|
||||||
|
|
||||||
%% check for empty bridge metrics
|
%% check for empty bridge metrics
|
||||||
{ok, 200, Bridge1Str} = request(get, uri(["bridges", BridgeID, "metrics"]), []),
|
{ok, 200, Bridge1Str} = request(get, uri(["bridges", BridgeID, "metrics"]), []),
|
||||||
ct:pal("HERE ~p", [jsx:decode(Bridge1Str)]),
|
|
||||||
?assertMatch(
|
?assertMatch(
|
||||||
#{
|
#{
|
||||||
<<"metrics">> := #{<<"success">> := 0},
|
<<"metrics">> := #{<<"success">> := 0},
|
||||||
|
@ -625,6 +624,12 @@ t_metrics(Config) ->
|
||||||
jsx:decode(Bridge1Str)
|
jsx:decode(Bridge1Str)
|
||||||
),
|
),
|
||||||
|
|
||||||
|
%% check that the bridge doesn't contain metrics anymore
|
||||||
|
{ok, 200, Bridge2Str} = request(get, uri(["bridges", BridgeID]), []),
|
||||||
|
Decoded = jsx:decode(Bridge2Str),
|
||||||
|
?assertNot(maps:is_key(<<"metrics">>, Decoded)),
|
||||||
|
?assertNot(maps:is_key(<<"node_metrics">>, Decoded)),
|
||||||
|
|
||||||
%% send an message to emqx and the message should be forwarded to the HTTP server
|
%% send an message to emqx and the message should be forwarded to the HTTP server
|
||||||
Body = <<"my msg">>,
|
Body = <<"my msg">>,
|
||||||
emqx:publish(emqx_message:make(<<"emqx_webhook/1">>, Body)),
|
emqx:publish(emqx_message:make(<<"emqx_webhook/1">>, Body)),
|
||||||
|
@ -645,19 +650,17 @@ t_metrics(Config) ->
|
||||||
),
|
),
|
||||||
|
|
||||||
%% check for non-empty bridge metrics
|
%% check for non-empty bridge metrics
|
||||||
{ok, 200, Bridge2Str} = request(get, uri(["bridges", BridgeID, "metrics"]), []),
|
{ok, 200, Bridge3Str} = request(get, uri(["bridges", BridgeID, "metrics"]), []),
|
||||||
ct:pal("HERE ~p", [jsx:decode(Bridge2Str)]),
|
|
||||||
?assertMatch(
|
?assertMatch(
|
||||||
#{
|
#{
|
||||||
<<"metrics">> := #{<<"success">> := 1},
|
<<"metrics">> := #{<<"success">> := 1},
|
||||||
<<"node_metrics">> := [_ | _]
|
<<"node_metrics">> := [_ | _]
|
||||||
},
|
},
|
||||||
jsx:decode(Bridge2Str)
|
jsx:decode(Bridge3Str)
|
||||||
),
|
),
|
||||||
|
|
||||||
%% check for non-empty metrics when listing all bridges
|
%% check for non-empty metrics when listing all bridges
|
||||||
{ok, 200, BridgesStr} = request(get, uri(["bridges"]), []),
|
{ok, 200, BridgesStr} = request(get, uri(["bridges"]), []),
|
||||||
ct:pal("HERE ~p", [jsx:decode(BridgesStr)]),
|
|
||||||
?assertMatch(
|
?assertMatch(
|
||||||
[
|
[
|
||||||
#{
|
#{
|
||||||
|
|
Loading…
Reference in New Issue