Explorar o código

refactor(emqx_bridge): use more simplistic function to validate connector

Stefan Strigler %!s(int64=2) %!d(string=hai) anos
pai
achega
9ebbc9bbea
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      apps/emqx_bridge/src/emqx_bridge_v2.erl

+ 2 - 2
apps/emqx_bridge/src/emqx_bridge_v2.erl

@@ -410,10 +410,10 @@ uninstall_bridge_v2(
     CreationOpts = emqx_resource:fetch_creation_opts(Config),
     CreationOpts = emqx_resource:fetch_creation_opts(Config),
     ok = emqx_resource_buffer_worker_sup:stop_workers(BridgeV2Id, CreationOpts),
     ok = emqx_resource_buffer_worker_sup:stop_workers(BridgeV2Id, CreationOpts),
     ok = emqx_resource:clear_metrics(BridgeV2Id),
     ok = emqx_resource:clear_metrics(BridgeV2Id),
-    case combine_connector_and_bridge_v2_config(BridgeV2Type, BridgeName, Config) of
+    case validate_referenced_connectors(BridgeV2Type, ConnectorName, BridgeName) of
         {error, _} ->
         {error, _} ->
             ok;
             ok;
-        _CombinedConfig ->
+        ok ->
             %% Deinstall from connector
             %% Deinstall from connector
             ConnectorId = emqx_connector_resource:resource_id(
             ConnectorId = emqx_connector_resource:resource_id(
                 connector_type(BridgeV2Type), ConnectorName
                 connector_type(BridgeV2Type), ConnectorName