Merge pull request #9035 from terry-xiaoyu/review_changes

fix(bridges): some issues found in code review

apps/emqx_bridge/i18n/emqx_bridge_schema.conf

@@ -173,8 +173,8 @@ emqx_bridge_schema {
                   }
      metric_retried {
                    desc {
-                         en: """Times of retried from the queue or the inflight window."""
-                         zh: """从队列或者飞行窗口里重试的次数。"""
+                         en: """Times of retried."""
+                         zh: """重试的次数。"""
                         }
                    label: {
                            en: "Retried"

apps/emqx_bridge/src/emqx_bridge.erl

@@ -249,19 +249,19 @@ remove(BridgeType, BridgeName) ->
     ).
 
 check_deps_and_remove(BridgeType, BridgeName, RemoveDeps) ->
-    Id = emqx_bridge_resource:bridge_id(BridgeType, BridgeName),
+    BridgeId = emqx_bridge_resource:bridge_id(BridgeType, BridgeName),
     %% NOTE: This violates the design: Rule depends on data-bridge but not vice versa.
-    case emqx_rule_engine:get_rule_ids_by_action(Id) of
+    case emqx_rule_engine:get_rule_ids_by_action(BridgeId) of
         [] ->
             remove(BridgeType, BridgeName);
-        Rules when RemoveDeps =:= false ->
-            {error, {rules_deps_on_this_bridge, Rules}};
-        Rules when RemoveDeps =:= true ->
+        RuleIds when RemoveDeps =:= false ->
+            {error, {rules_deps_on_this_bridge, RuleIds}};
+        RuleIds when RemoveDeps =:= true ->
             lists:foreach(
                 fun(R) ->
-                    emqx_rule_engine:ensure_action_removed(R, Id)
+                    emqx_rule_engine:ensure_action_removed(R, BridgeId)
                 end,
-                Rules
+                RuleIds
             ),
             remove(BridgeType, BridgeName)
     end.

apps/emqx_bridge/src/emqx_bridge_api.erl

@@ -331,7 +331,7 @@ schema("/bridges/:id") ->
             responses => #{
                 204 => <<"Bridge deleted">>,
                 400 => error_schema(['INVALID_ID'], "Update bridge failed"),
-                403 => error_schema('FORBIDDEN_REQUEST', "forbidden operation"),
+                403 => error_schema('FORBIDDEN_REQUEST', "Forbidden operation"),
                 503 => error_schema('SERVICE_UNAVAILABLE', "Service unavailable")
             }
         }