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

Merge pull request #12420 from kjellwinblad/kjell/fix/kinesis/refactoring/problems/thanks_HJianBo 

fix: kinesis schema problems found by @HJianBo
This commit is contained in:
Kjell Winblad 2024-01-31 15:52:45 +01:00 committed by GitHub
parent 5bc67cb288 274f378c6e
commit 2680fae9b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/emqx_bridge_kinesis/src/emqx_bridge_kinesis.erl
View File

@ -42,7 +42,7 @@ fields(Field) when
emqx_connector_schema:api_fields( emqx_connector_schema:api_fields(
Field, Field,
?CONNECTOR_TYPE, ?CONNECTOR_TYPE,
connector_config_fields() fields("config_connector")
); );
fields(action) -> fields(action) ->
{?ACTION_TYPE, {?ACTION_TYPE,
@ -54,7 +54,7 @@ fields(action) ->
} }
)}; )};
fields(action_parameters) -> fields(action_parameters) ->
fields(producer); proplists:delete(local_topic, fields(producer));
fields(kinesis_action) -> fields(kinesis_action) ->
emqx_bridge_v2_schema:make_producer_action_schema( emqx_bridge_v2_schema:make_producer_action_schema(
hoconsc:mk( hoconsc:mk(
@ -142,13 +142,6 @@ fields(producer) ->
desc => ?DESC("payload_template") desc => ?DESC("payload_template")
} }
)}, )},
{local_topic,
sc(
binary(),
#{
desc => ?DESC("local_topic")
}
)},
{stream_name, {stream_name,
sc( sc(
binary(), binary(),
@ -165,6 +158,16 @@ fields(producer) ->
desc => ?DESC("partition_key") desc => ?DESC("partition_key")
} }
)} )}
] ++ fields(local_topic);
fields(local_topic) ->
[
{local_topic,
sc(
binary(),
#{
desc => ?DESC("local_topic")
}
)}
]; ];
fields("get_producer") -> fields("get_producer") ->
emqx_bridge_schema:status_fields() ++ fields("post_producer"); emqx_bridge_schema:status_fields() ++ fields("post_producer");
@ -174,7 +177,7 @@ fields("put_producer") ->
fields("config_producer"); fields("config_producer");
fields("config_connector") -> fields("config_connector") ->
emqx_connector_schema:common_fields() ++ emqx_connector_schema:common_fields() ++
connector_config_fields() ++ fields(connector_config) ++
emqx_connector_schema:resource_opts_ref(?MODULE, connector_resource_opts); emqx_connector_schema:resource_opts_ref(?MODULE, connector_resource_opts);
fields(connector_resource_opts) -> fields(connector_resource_opts) ->
emqx_connector_schema:resource_opts_fields(); emqx_connector_schema:resource_opts_fields();
@ -278,9 +281,6 @@ conn_bridge_values() ->
%% Helper fns %% Helper fns
%%------------------------------------------------------------------------------------------------- %%-------------------------------------------------------------------------------------------------
connector_config_fields() ->
fields(connector_config).
sc(Type, Meta) -> hoconsc:mk(Type, Meta). sc(Type, Meta) -> hoconsc:mk(Type, Meta).
mk(Type, Meta) -> hoconsc:mk(Type, Meta). mk(Type, Meta) -> hoconsc:mk(Type, Meta).