From 39791511fcab8f7ebaedad9eb54433abbfad4ebc Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Tue, 21 Nov 2023 17:38:13 -0300 Subject: [PATCH] chore: remove obsolete workaround --- apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl | 9 +++------ apps/emqx_conf/src/emqx_conf.erl | 7 +------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl index f7205e6ae..8c90e0896 100644 --- a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl +++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.erl @@ -615,14 +615,11 @@ producer_opts(ActionOrBridgeV1) -> %% Hoever we need to keep it backward compatible for generated schema json (version 0.1.0) %% since schema is data for the 'schemas' API. parameters_field(ActionOrBridgeV1) -> - OverriddenV1 = <<"0.1.0">> =:= get(emqx_bridge_schema_version), {Name, Alias} = - case {OverriddenV1, ActionOrBridgeV1} of - {true, _} -> + case ActionOrBridgeV1 of + v1 -> {kafka, parameters}; - {_, v1} -> - {kafka, parameters}; - {_, action} -> + action -> {parameters, kafka} end, {Name, diff --git a/apps/emqx_conf/src/emqx_conf.erl b/apps/emqx_conf/src/emqx_conf.erl index c986a65ee..7ff06b0ef 100644 --- a/apps/emqx_conf/src/emqx_conf.erl +++ b/apps/emqx_conf/src/emqx_conf.erl @@ -193,12 +193,7 @@ hotconf_schema_json() -> bridge_schema_json() -> Version = <<"0.1.0">>, SchemaInfo = #{title => <<"EMQX Data Bridge API Schema">>, version => Version}, - put(emqx_bridge_schema_version, Version), - try - gen_api_schema_json_iodata(emqx_bridge_api, SchemaInfo) - after - erase(emqx_bridge_schema_version) - end. + gen_api_schema_json_iodata(emqx_bridge_api, SchemaInfo). %% TODO: remove it and also remove hocon_md.erl and friends. %% markdown generation from schema is a failure and we are moving to an interactive