From 22356b7c253d49b14fd8d88d4ac67b01ff0fa59d Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Thu, 22 Jun 2023 10:01:22 -0300 Subject: [PATCH] chore: hide gcp pubsub consumer until e5.2.0 --- .../emqx_bridge_gcp_pubsub_consumer_SUITE.erl | 19 ++++++++++--------- lib-ee/emqx_ee_bridge/src/emqx_ee_bridge.erl | 5 ++++- 2 files changed, 14 insertions(+), 10 deletions(-) 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/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 } )}