chore: update to EMQX 5.9.0

Author: savonarola

Makefile

@@ -48,7 +48,7 @@ clean:
 .PHONY: distclean
 distclean: clean
 	@rm -rf _build
-	@rm -f data/app.*.config data/vm.*.args rebar.lock
+	@rm -f rebar.lock
 
 .PHONY: rel
 rel: $(REBAR)

docker-compose.yml

@@ -1,8 +1,6 @@
 services:
   emqx:
-    image: emqx/emqx-enterprise:5.8.5
-    # TODO: uncomment when 5.9.0 image is released
-    # image: docker.io/emqx/emqx-enterprise:5.9.0
+    image: emqx/emqx-enterprise:5.9.0
     container_name: emqx
     environment:
       EMQX_LOG__CONSOLE__LEVEL: debug

rebar.config

@@ -1,12 +1,12 @@
 %% -*- mode: erlang -*-
 {deps, [
     {emqx_plugin_helper,
-        {git, "https://github.com/savonarola/emqx-plugin-helper.git", {branch, "main"}}}
+        {git, "https://github.com/savonarola/emqx-plugin-helper.git", {branch, "v5.9.0"}}}
 ]}.
 
 {plugins, [
     {emqx_plugin_helper,
-        {git, "https://github.com/savonarola/emqx-plugin-helper.git", {branch, "main"}}},
+        {git, "https://github.com/savonarola/emqx-plugin-helper.git", {branch, "v5.9.0"}}},
     {erlfmt, "1.6.0"}
 ]}.
 

src/emqx_omp.erl

@@ -164,7 +164,7 @@ status_to_error_list(ok) -> [];
 status_to_error_list({error, Error}) -> [Error].
 
 current_config() ->
-    emqx_plugin_helper:get_config(?PLUGIN_NAME).
+    emqx_plugin_helper:get_config(?PLUGIN_NAME_VSN).
 
 init_metrics() ->
     ?SLOG(info, #{msg => "omp_init_metrics"}),

src/emqx_omp_redis.erl

@@ -433,7 +433,7 @@ stop_resource() ->
         msg => omp_redis_resource_stop,
         resource_id => ?RESOURCE_ID
     }),
-    emqx_resource:remove_local(?RESOURCE_ID).
+    ok = emqx_resource:remove_local(?RESOURCE_ID).
 
 sync_cmd(Cmd) ->
     emqx_resource:simple_sync_query(?RESOURCE_ID, {cmd, Cmd}).

test/emqx_omp_SUITE.erl

@@ -33,9 +33,7 @@ groups() ->
         [mysql_tcp, mysql_ssl, redis_tcp, redis_ssl],
         [sync, async],
         [buffered, unbuffered],
-        %% TODO: restore t_health_check when 5.9.0 image is released
-        %% and used in the Docker Compose file
-        emqx_omp_test_helpers:all(?MODULE) -- [t_health_check]
+        emqx_omp_test_helpers:all(?MODULE)
     ]).
 
 init_per_suite(Config) ->