Merge pull request #3607 from esl/remove-mod_aws_sns

Remove deprecated mod_aws_sns
esl · Mar 24, 2022 · dca553d · dca553d
2 parents b6da9a9 + 65cc2ff
commit dca553d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 45 deletions.
diff --git a/big_tests/default.spec b/big_tests/default.spec
@@ -37,10 +37,10 @@
 {suites, "tests", metrics_register_SUITE}.
 {suites, "tests", metrics_roster_SUITE}.
 {suites, "tests", metrics_session_SUITE}.
-{suites, "tests", mod_aws_sns_SUITE}.
 {suites, "tests", mod_blocking_SUITE}.
 {suites, "tests", mod_event_pusher_rabbit_SUITE}.
 {suites, "tests", mod_event_pusher_http_SUITE}.
+{suites, "tests", mod_event_pusher_sns_SUITE}.
 {suites, "tests", mod_global_distrib_SUITE}.
 {suites, "tests", mod_http_upload_SUITE}.
 {suites, "tests", mod_ping_SUITE}.

diff --git a/big_tests/tests/mod_aws_sns_SUITE.erl → ...ests/tests/mod_event_pusher_sns_SUITE.erl b/big_tests/tests/mod_aws_sns_SUITE.erl → ...ests/tests/mod_event_pusher_sns_SUITE.erl
@@ -1,4 +1,4 @@
--module(mod_aws_sns_SUITE).
+-module(mod_event_pusher_sns_SUITE).
 -compile([export_all, nowarn_export_all]).
 -include_lib("escalus/include/escalus.hrl").
 -include_lib("common_test/include/ct.hrl").
@@ -87,9 +87,12 @@ init_per_group(_, Config0) ->
     Domain = domain(),
     Config1 = dynamic_modules:save_modules(Domain, Config0),
     Config = [{sns_config, ?SNS_OPTS} | Config1],
-    dynamic_modules:ensure_modules(Domain, [{mod_aws_sns, ?SNS_OPTS}]),
+    dynamic_modules:ensure_modules(Domain, required_modules()),
     Config.
 
+required_modules() ->
+    [{mod_event_pusher, [{backends, [{sns, ?SNS_OPTS}]}]}].
+
 end_per_group(_, Config) ->
     dynamic_modules:restore_modules(Config),
     escalus:delete_users(Config, escalus:get_users([bob, alice])).

diff --git a/src/mod_aws_sns.erl b/src/mod_aws_sns.erl
diff --git a/test/mod_aws_sns_SUITE.erl → test/event_pusher_sns_SUITE.erl b/test/mod_aws_sns_SUITE.erl → test/event_pusher_sns_SUITE.erl
@@ -1,4 +1,4 @@
--module(mod_aws_sns_SUITE).
+-module(event_pusher_sns_SUITE).
 
 -compile([export_all, nowarn_export_all]).
 
@@ -134,7 +134,7 @@ end_per_suite(_) ->
 
 init_per_testcase(_, Config) ->
     meck:new([gen_mod, erlcloud_sns, mongoose_wpool], [non_strict, passthrough]),
-    meck:expect(erlcloud_sns, new, fun(_, _, _) -> mod_aws_sns_SUITE_erlcloud_sns_new end),
+    meck:expect(erlcloud_sns, new, fun(_, _, _) -> event_pusher_sns_SUITE_erlcloud_sns_new end),
     set_sns_config(#{}),
     meck:expect(mongoose_wpool, cast, fun(_, _, _, {M, F, A}) -> erlang:apply(M, F, A) end),
     [{sender, jid:from_binary(<<"sender@localhost">>)},
@@ -169,7 +169,7 @@ user_not_present_callback(Config) ->
 %% Helpers
 
 custom_callback_module(UserId, Attributes) ->
-    Module = mod_aws_sns_SUITE_mockcb,
+    Module = event_pusher_sns_SUITE_mockcb,
     set_sns_config(#{plugin_module => Module}),
     meck:new(Module, [non_strict]),
     meck:expect(Module, user_guid, fun(_) -> UserId end),