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

Merge pull request #11125 from thalesmg/hide-gcp-consumer 

chore: hide gcp consumer
This commit is contained in:
Thales Macedo Garitezi 2023-06-22 11:29:31 -03:00 committed by GitHub
parent 2f00cf7f84 22356b7c25
commit 36ad8f25ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_bridge/src/emqx_bridge.app.src
View File

@ -1,7 +1,7 @@
%% -*- mode: erlang -*-
{application, emqx_bridge, [
{description, "EMQX bridges"},
{vsn, "0.1.21"},
{vsn, "0.1.22"},
{registered, [emqx_bridge_sup]},
{mod, {emqx_bridge_app, []}},
{applications, [

2
apps/emqx_bridge_gcp_pubsub/src/emqx_bridge_gcp_pubsub.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_bridge_gcp_pubsub, [
{description, "EMQX Enterprise GCP Pub/Sub Bridge"},
{vsn, "0.1.2"},
{vsn, "0.1.3"},
{registered, []},
{applications, [
kernel,

19
apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_consumer_SUITE.erl
View File

@ -581,15 +581,16 @@ t_consume_ok(Config) ->
?assertEqual(3, emqx_resource_metrics:received_get(ResourceId))
),
%% Check that the bridge probe API doesn't leak atoms.
ProbeRes0 = probe_bridge_api(Config),
?assertMatch({ok, {{_, 204, _}, _Headers, _Body}}, ProbeRes0),
AtomsBefore = erlang:system_info(atom_count),
%% Probe again; shouldn't have created more atoms.
ProbeRes1 = probe_bridge_api(Config),
?assertMatch({ok, {{_, 204, _}, _Headers, _Body}}, ProbeRes1),
AtomsAfter = erlang:system_info(atom_count),
?assertEqual(AtomsBefore, AtomsAfter),
%% FIXME: uncomment after API spec is un-hidden...
%% %% Check that the bridge probe API doesn't leak atoms.
%% ProbeRes0 = probe_bridge_api(Config),
%% ?assertMatch({ok, {{_, 204, _}, _Headers, _Body}}, ProbeRes0),
%% AtomsBefore = erlang:system_info(atom_count),
%% %% Probe again; shouldn't have created more atoms.
%% ProbeRes1 = probe_bridge_api(Config),
%% ?assertMatch({ok, {{_, 204, _}, _Headers, _Body}}, ProbeRes1),
%% AtomsAfter = erlang:system_info(atom_count),
%% ?assertEqual(AtomsBefore, AtomsAfter),
assert_non_received_metrics(BridgeName),

2
apps/emqx_conf/src/emqx_conf.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_conf, [
{description, "EMQX configuration management"},
{vsn, "0.1.22"},
{vsn, "0.1.23"},
{registered, []},
{mod, {emqx_conf_app, []}},
{applications, [kernel, stdlib, emqx_ctl]},

2
lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_ee_bridge, [
{description, "EMQX Enterprise data bridges"},
{vsn, "0.1.15"},
{vsn, "0.1.16"},
{registered, []},
{applications, [
kernel,

5
lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl
View File

@ -3,6 +3,7 @@
%%--------------------------------------------------------------------
-module(emqx_ee_bridge).
-include_lib("hocon/include/hoconsc.hrl").
-import(hoconsc, [mk/2, enum/1, ref/2]).
-export([
@ -17,7 +18,8 @@ api_schemas(Method) ->
%% We need to map the `type' field of a request (binary) to a
%% bridge schema module.
api_ref(emqx_bridge_gcp_pubsub, <<"gcp_pubsub">>, Method ++ "_producer"),
api_ref(emqx_bridge_gcp_pubsub, <<"gcp_pubsub_consumer">>, Method ++ "_consumer"),
%% TODO: un-hide for e5.2.0...
%% api_ref(emqx_bridge_gcp_pubsub, <<"gcp_pubsub_consumer">>, Method ++ "_consumer"),
api_ref(emqx_bridge_kafka, <<"kafka_consumer">>, Method ++ "_consumer"),
%% TODO: rename this to `kafka_producer' after alias support is added
%% to hocon; keeping this as just `kafka' for backwards compatibility.
@ -259,6 +261,7 @@ gcp_pubsub_structs() ->
hoconsc:map(name, ref(emqx_bridge_gcp_pubsub, "config_consumer")),
#{
desc => <<"EMQX Enterprise Config">>,
importance => ?IMPORTANCE_HIDDEN,
required => false
}
)}