diff --git a/apps/emqx_bridge/src/emqx_bridge.app.src b/apps/emqx_bridge/src/emqx_bridge.app.src index 3793dc6d2..ac1a3443f 100644 --- a/apps/emqx_bridge/src/emqx_bridge.app.src +++ b/apps/emqx_bridge/src/emqx_bridge.app.src @@ -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, [ diff --git a/apps/emqx_bridge_gcp_pubsub/src/emqx_bridge_gcp_pubsub.app.src b/apps/emqx_bridge_gcp_pubsub/src/emqx_bridge_gcp_pubsub.app.src index f7401d423..85bbfdd8c 100644 --- a/apps/emqx_bridge_gcp_pubsub/src/emqx_bridge_gcp_pubsub.app.src +++ b/apps/emqx_bridge_gcp_pubsub/src/emqx_bridge_gcp_pubsub.app.src @@ -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, diff --git a/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_consumer_SUITE.erl b/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_consumer_SUITE.erl index 2e32f630a..849ed5325 100644 --- a/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_consumer_SUITE.erl +++ b/apps/emqx_bridge_gcp_pubsub/test/emqx_bridge_gcp_pubsub_consumer_SUITE.erl @@ -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), diff --git a/apps/emqx_conf/src/emqx_conf.app.src b/apps/emqx_conf/src/emqx_conf.app.src index 8945ba3eb..d8ee672f3 100644 --- a/apps/emqx_conf/src/emqx_conf.app.src +++ b/apps/emqx_conf/src/emqx_conf.app.src @@ -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]}, diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src index 4b6acf915..e03cc9423 100644 --- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src +++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.app.src @@ -1,6 +1,6 @@ {application, emqx_ee_bridge, [ {description, "EMQX Enterprise data bridges"}, - {vsn, "0.1.15"}, + {vsn, "0.1.16"}, {registered, []}, {applications, [ kernel, diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl index ab23cbc02..b418f9e15 100644 --- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl +++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl @@ -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 } )}