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

fix(s3-bridge): ensure bridge and connector names are identical

This commit is contained in:
Andrew Mayorov 2024-02-12 10:44:43 +01:00
parent 0edc5b5992
commit 2b1231b980
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_bridge_s3/src/emqx_bridge_s3.erl
View File

@ -101,6 +101,8 @@ fields(s3_connector_resource_opts) ->
desc("config_connector") -> desc("config_connector") ->
?DESC(config_connector); ?DESC(config_connector);
desc(?ACTION) ->
?DESC(s3_upload);
desc(s3_upload) -> desc(s3_upload) ->
?DESC(s3_upload); ?DESC(s3_upload);
desc(s3_upload_parameters) -> desc(s3_upload_parameters) ->

2
apps/emqx_bridge_s3/src/emqx_bridge_s3.hrl
View File

@ -5,7 +5,7 @@
-ifndef(__EMQX_BRIDGE_S3_HRL__). -ifndef(__EMQX_BRIDGE_S3_HRL__).
-define(__EMQX_BRIDGE_S3_HRL__, true). -define(__EMQX_BRIDGE_S3_HRL__, true).
-define(ACTION, s3_upload). -define(ACTION, s3).
-define(CONNECTOR, s3). -define(CONNECTOR, s3).
-endif. -endif.

2
apps/emqx_bridge_s3/src/emqx_bridge_s3_action_info.erl
View File

@ -12,7 +12,7 @@
schema_module/0 schema_module/0
]). ]).
action_type_name() -> s3_upload. action_type_name() -> s3.
connector_type_name() -> s3. connector_type_name() -> s3.

2
apps/emqx_bridge_s3/test/emqx_bridge_s3_SUITE.erl
View File

@ -13,7 +13,7 @@
-import(emqx_utils_conv, [bin/1]). -import(emqx_utils_conv, [bin/1]).
%% See `emqx_bridge_s3.hrl`. %% See `emqx_bridge_s3.hrl`.
-define(BRIDGE_TYPE, <<"s3_upload">>). -define(BRIDGE_TYPE, <<"s3">>).
-define(CONNECTOR_TYPE, <<"s3">>). -define(CONNECTOR_TYPE, <<"s3">>).
-define(PROXY_NAME, "minio_tcp"). -define(PROXY_NAME, "minio_tcp").