Merge pull request #7066 from savonarola/no-elvis-4.3

chore(codestyle): remove Elvis

.github/workflows/code_style_check.yaml

@@ -1,24 +0,0 @@
-name: Code style check
-
-on: [pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 1000
-      - name: Set git token
-        if: endsWith(github.repository, 'enterprise')
-        run: |
-          echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
-          git config --global credential.helper store
-      - name: Run elvis check
-        run: |
-          set -e
-          if [ -f EMQX_ENTERPRISE ]; then
-            ./scripts/elvis-check.sh $GITHUB_BASE_REF emqx-enterprise
-          else
-            ./scripts/elvis-check.sh $GITHUB_BASE_REF emqx
-          fi

apps/emqx_management/src/emqx_management.app.src

@@ -1,6 +1,6 @@
 {application, emqx_management,
  [{description, "EMQ X Management API and CLI"},
-  {vsn, "4.3.11"}, % strict semver, bump manually!
+  {vsn, "4.3.12"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_management_sup]},
   {applications, [kernel,stdlib,minirest]},

apps/emqx_management/src/emqx_mgmt.erl

@@ -123,8 +123,6 @@
 -define(MAX_ROW_LIMIT, 10000).
 
 -define(APP, emqx_management).
-
--elvis([{elvis_style, god_modules, disable}]).
 %%--------------------------------------------------------------------
 %% Node Info
 %%--------------------------------------------------------------------

apps/emqx_stomp/src/emqx_stomp.app.src

@@ -1,6 +1,6 @@
 {application, emqx_stomp,
  [{description, "EMQ X Stomp Protocol Plugin"},
-  {vsn, "4.3.4"}, % strict semver, bump manually!
+  {vsn, "4.3.5"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_stomp_sup]},
   {applications, [kernel,stdlib]},

apps/emqx_stomp/src/emqx_stomp.appup.src

@@ -1,8 +1,15 @@
 %% -*- mode: erlang -*-
 {VSN,
-  [{"4.3.3",[{load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
+  [{"4.3.4",
-   {"4.3.2",
     [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]}]},
+   {"4.3.3",
+    [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
+   {"4.3.2",
+    [{load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
      {load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
    {"4.3.1",
     [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
@@ -12,14 +19,20 @@
     [{restart_application,emqx_stomp},
      {apply,{emqx_stomp,force_clear_after_app_stoped,[]}}]},
    {<<".*">>,[]}],
-  [{"4.3.3",[{load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
+  [{"4.3.4",
-   {"4.3.2",
     [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]}]},
+   {"4.3.3",
+    [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
+   {"4.3.2",
+    [{load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
      {load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]}]},
    {"4.3.1",
     [{load_module,emqx_stomp_protocol,brutal_purge,soft_purge,[]},
      {load_module,emqx_stomp_frame,brutal_purge,soft_purge,[]},
      {load_module,emqx_stomp_connection,brutal_purge,soft_purge,[]}]},
-   {"4.3.0",
+   {"4.3.0",[{restart_application,emqx_stomp}]},
-    [{restart_application,emqx_stomp}]},
    {<<".*">>,[]}]}.

apps/emqx_stomp/src/emqx_stomp_connection.erl

@@ -91,8 +91,6 @@
 
 -define(ENABLED(X), (X =/= undefined)).
 
--elvis([{elvis_style, invalid_dynamic_call, #{ignore => [emqx_stomp_connection]}}]).
-
 -dialyzer({nowarn_function, [ ensure_stats_timer/2
                             ]}).
 

apps/emqx_stomp/src/emqx_stomp_protocol.erl

@@ -108,8 +108,6 @@
                             , init/2
                             ]}).
 
--elvis([{elvis_style, dont_repeat_yourself, disable}]).
-
 -type(pstate() :: #pstate{}).
 
 %% @doc Init protocol

elvis.config

@@ -1,47 +0,0 @@
-%% -*-: erlang -*-
-[
- {
-   elvis,
-   [
-    {config,
-     [
-      #{dirs => ["src", "apps/**/src", "lib-ce/**/src", "lib-ee/**/src"],
-        filter => "*.erl",
-        ruleset => erl_files,
-        rules => [
-            {elvis_style, state_record_and_type, disable},
-            {elvis_style, no_common_caveats_call, #{}},
-            {elvis_style, no_debug_call, #{ debug_functions => [ {ct, pal}
-                                                               , {ct, print}
-                                                               ]}},
-            {elvis_style, operator_spaces, #{rules => [{right, "|"},
-                                                       {left, "|"},
-                                                       {right, "||"},
-                                                       {left, "||"}]}}
-           ]
-        },
-      #{dirs => ["test", "apps/**/test", "lib-ce/**/src"],
-        filter => "*.erl",
-        rules => [
-           {elvis_text_style, line_length, #{ limit => 100
-                                             , skip_comments => false }},
-           {elvis_style, dont_repeat_yourself, #{ min_complexity => 100 }}
-          ]
-        },
-      #{dirs => ["."],
-        filter => "Makefile",
-        ruleset => makefiles
-       },
-      #{dirs => ["."],
-        filter => "rebar.config",
-        ruleset => rebar_config
-       },
-      #{dirs => ["."],
-        filter => "elvis.config",
-        ruleset => elvis_config
-       }
-     ]
-    }
-   ]
- }
-].

scripts/elvis-check.sh

@@ -1,84 +0,0 @@
-#!/usr/bin/env bash
-
-## This script checks style of changed files.
-## Expect argument 1 to be the git compare base.
-
-set -euo pipefail
-
-elvis_version='1.0.0-emqx-2'
-
-base="${1:-}"
-repo="${2:-emqx/emqx}"
-REPO="${GITHUB_REPOSITORY:-${repo}}"
-if [ "${base}" = "" ]; then
-    echo "Usage $0 <git-compare-base-ref>"
-    exit 1
-fi
-
-echo "elvis -v: $elvis_version"
-echo "git diff base: $base"
-
-if [ ! -f ./elvis ] || [ "$(./elvis -v | grep -oE '[1-9]+\.[0-9]+\.[0-9]+\-emqx-[0-9]+')" != "$elvis_version" ]; then
-    curl  --silent --show-error -fLO "https://github.com/emqx/elvis/releases/download/$elvis_version/elvis"
-    chmod +x ./elvis
-fi
-
-if [[ "$base" =~ [0-9a-f]{8,40} ]]; then
-    # base is a commit sha1
-    compare_base="$base"
-else
-    remote="$(git remote -v | grep -E "github\.com(:|/)$REPO((\.git)|(\s))" | grep fetch | awk '{print $1}')"
-    git fetch "$remote" "$base"
-    compare_base="$remote/$base"
-fi
-
-git_diff() {
-    git diff --name-only --diff-filter=ACMRTUXB "$compare_base"...HEAD
-}
-
-bad_file_count=0
-for file in $(git_diff); do
-    if [ ! -f "$file" ]; then
-        # file is deleted, skip
-        continue
-    fi
-    if [[ $file != *.erl ]]; then
-        # not .erl file
-        continue
-    fi
-    if ! ./elvis rock "$file" -c elvis.config; then
-        bad_file_count=$(( bad_file_count + 1))
-    fi
-done
-if [ $bad_file_count -gt 0 ]; then
-    echo "elvis: $bad_file_count errors"
-    exit 1
-fi
-
-### now check new-line at EOF for changed files
-
-nl_at_eof() {
-    local file="$1"
-    if ! [ -f "$file" ]; then
-        return
-    fi
-    case "$file" in
-        *.png|*rebar3)
-            return
-            ;;
-    esac
-    local lastbyte
-    lastbyte="$(tail -c 1 "$file" 2>&1)"
-    if [ "$lastbyte" != '' ]; then
-        echo "$file"
-        return 1
-    fi
-}
-
-for file in $(git_diff); do
-    if ! nl_at_eof "$file"; then
-        bad_file_count=$(( bad_file_count  + 1 ))
-    fi
-done
-
-exit $bad_file_count

src/emqx.appup.src

@@ -1,8 +1,14 @@
 %% -*- mode: erlang -*-
 {VSN,
-  [{"4.3.13",[{load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
+  [{"4.3.13",
+    [{load_module,emqx_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
+     {load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
    {"4.3.12",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
@@ -16,7 +22,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.11",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
@@ -35,7 +42,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.10",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
@@ -54,7 +62,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.9",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
@@ -78,7 +87,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.8",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
@@ -102,7 +112,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.7",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
@@ -128,7 +139,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.6",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
      {load_module,emqx_access_control,brutal_purge,soft_purge,[]},
@@ -154,7 +166,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.5",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
      {load_module,emqx_access_control,brutal_purge,soft_purge,[]},
@@ -181,7 +194,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.4",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
      {load_module,emqx_access_control,brutal_purge,soft_purge,[]},
@@ -209,7 +223,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.3",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
      {load_module,emqx_access_control,brutal_purge,soft_purge,[]},
@@ -238,7 +253,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.2",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
      {load_module,emqx_access_control,brutal_purge,soft_purge,[]},
@@ -267,7 +283,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.1",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
      {load_module,emqx_access_control,brutal_purge,soft_purge,[]},
@@ -300,7 +317,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.0",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
      {apply,{emqx_metrics,assign_acl_stats_from_ets_to_counter,[]}},
      {apply,{emqx_metrics,upgrade_retained_delayed_counter_type,[]}},
@@ -336,9 +354,15 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
-  [{"4.3.13",[{load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
+  [{"4.3.13",
+    [{load_module,emqx_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
+     {load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
    {"4.3.12",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_connection,brutal_purge,soft_purge,[]},
+     {load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_access_control,brutal_purge,soft_purge,[]},
@@ -351,7 +375,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.11",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_connection,brutal_purge,soft_purge,[]},
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
@@ -369,7 +394,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.10",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_metrics,brutal_purge,soft_purge,[]},
@@ -387,7 +413,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.9",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_vm,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
@@ -410,7 +437,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.8",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_vm,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
@@ -433,7 +461,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.7",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_ctl,brutal_purge,soft_purge,[]},
      {load_module,emqx_vm,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
@@ -458,7 +487,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.6",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_vm,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
@@ -483,7 +513,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.5",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_vm,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
@@ -509,7 +540,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.4",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_vm,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
@@ -536,7 +568,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.3",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_vm,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
@@ -564,7 +597,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.2",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_vm,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_pqueue,brutal_purge,soft_purge,[]},
@@ -592,7 +626,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.1",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_vm,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_pqueue,brutal_purge,soft_purge,[]},
@@ -624,7 +659,8 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {"4.3.0",
-    [{load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_banned,brutal_purge,soft_purge,[]},
+     {load_module,emqx_vm_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_vm,brutal_purge,soft_purge,[]},
      {load_module,emqx_sys_mon,brutal_purge,soft_purge,[]},
      {load_module,emqx_alarm_handler,brutal_purge,soft_purge,[]},

src/emqx_banned.erl

@@ -47,8 +47,6 @@
         , code_change/3
         ]).
 
--elvis([{elvis_style, state_record_and_type, disable}]).
-
 -define(BANNED_TAB, ?MODULE).
 
 %%--------------------------------------------------------------------

src/emqx_connection.erl

@@ -30,8 +30,6 @@
 -compile(nowarn_export_all).
 -endif.
 
--elvis([{elvis_style, invalid_dynamic_call, #{ignore => [emqx_connection]}}]).
-
 %% API
 -export([ start_link/3
         , stop/1

src/emqx_ctl.erl

@@ -57,8 +57,6 @@
         , code_change/3
         ]).
 
--elvis([{elvis_style, invalid_dynamic_call, #{ignore => [emqx_ctl]}}]).
-
 -record(state, {seq = 0}).
 
 -type(cmd() :: atom()).

src/emqx_logger_jsonfmt.erl

@@ -37,8 +37,6 @@
 
 -export_type([config/0]).
 
--elvis([{elvis_style, no_nested_try_catch, #{ ignore => [emqx_logger_jsonfmt]}}]).
-
 -type config() :: #{depth       => pos_integer() | unlimited,
                     report_cb   => logger:report_cb(),
                     single_line => boolean()}.

src/emqx_message.erl

@@ -84,8 +84,6 @@
 
 -export([format/1]).
 
--elvis([{elvis_style, god_modules, disable}]).
-
 -spec(make(emqx_topic:topic(), emqx_types:payload()) -> emqx_types:message()).
 make(Topic, Payload) ->
     make(undefined, Topic, Payload).