Naming

3 files changed, 13 insertions, 13 deletions

diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl
index 1febf9e5b8..a448ab9856 100644
--- a/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl
+++ b/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl
@@ -53,9 +53,9 @@ start_child({VHost, ShovelName} = Name, Def) ->
     Result.
 
 obfuscated_uris_parameters(Def) when is_map(Def) ->
-    to_map(rabbit_shovel_parameters:obfuscate_uris_parameters(to_list(Def)));
+    to_map(rabbit_shovel_parameters:obfuscate_uris_in_definition(to_list(Def)));
 obfuscated_uris_parameters(Def) when is_list(Def) ->
-    rabbit_shovel_parameters:obfuscate_uris_parameters(Def).
+    rabbit_shovel_parameters:obfuscate_uris_in_definition(Def).
 
 child_exists(Name) ->
     lists:any(fun ({N, _, _, _}) -> N =:= Name end,
diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_parameters.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_parameters.erl
index 58c4230a65..40316fb657 100644
--- a/deps/rabbitmq_shovel/src/rabbit_shovel_parameters.erl
+++ b/deps/rabbitmq_shovel/src/rabbit_shovel_parameters.erl
@@ -13,7 +13,7 @@
 
 -export([validate/5, notify/5, notify_clear/4]).
 -export([register/0, unregister/0, parse/3]).
--export([obfuscate_uris_parameters/1]).
+-export([obfuscate_uris_in_definition/1]).
 
 -import(rabbit_misc, [pget/2, pget/3, pset/3]).
 
@@ -83,7 +83,7 @@ validate_amqp091_src(Def) ->
              ok
      end].
 
-obfuscate_uris_parameters(Def) ->
+obfuscate_uris_in_definition(Def) ->
   SrcURIs  = get_uris(<<"src-uri">>, Def),
   ObfuscatedSrcURIsDef = pset(<<"src-uri">>, obfuscate_uris(SrcURIs), Def),
   DestURIs  = get_uris(<<"dest-uri">>, Def),
@@ -290,7 +290,7 @@ parse_dest(VHostName, ClusterName, Def, SourceHeaders) ->
     end.
 
 parse_amqp10_dest({_VHost, _Name}, _ClusterName, Def, SourceHeaders) ->
-    Uris = get_unencrypted_uris(<<"dest-uri">>, Def),
+    Uris = deobfuscated_uris(<<"dest-uri">>, Def),
     Address = pget(<<"dest-address">>, Def),
     Properties =
         rabbit_data_coercion:to_proplist(
@@ -316,7 +316,7 @@ parse_amqp10_dest({_VHost, _Name}, _ClusterName, Def, SourceHeaders) ->
      }.
 
 parse_amqp091_dest({VHost, Name}, ClusterName, Def, SourceHeaders) ->
-    DestURIs  = get_unencrypted_uris(<<"dest-uri">>,      Def),
+    DestURIs  = deobfuscated_uris(<<"dest-uri">>,      Def),
     DestX     = pget(<<"dest-exchange">>,     Def, none),
     DestXKey  = pget(<<"dest-exchange-key">>, Def, none),
     DestQ     = pget(<<"dest-queue">>,        Def, none),
@@ -384,7 +384,7 @@ parse_amqp091_dest({VHost, Name}, ClusterName, Def, SourceHeaders) ->
                 }, Details).
 
 parse_amqp10_source(Def) ->
-    Uris = get_unencrypted_uris(<<"src-uri">>, Def),
+    Uris = deobfuscated_uris(<<"src-uri">>, Def),
     Address = pget(<<"src-address">>, Def),
     DeleteAfter = pget(<<"src-delete-after">>, Def, <<"never">>),
     PrefetchCount = pget(<<"src-prefetch-count">>, Def, 1000),
@@ -397,7 +397,7 @@ parse_amqp10_source(Def) ->
        consumer_args => []}, Headers}.
 
 parse_amqp091_source(Def) ->
-    SrcURIs  = get_unencrypted_uris(<<"src-uri">>, Def),
+    SrcURIs  = deobfuscated_uris(<<"src-uri">>, Def),
     SrcX     = pget(<<"src-exchange">>,Def, none),
     SrcXKey  = pget(<<"src-exchange-key">>, Def, <<>>), %% [1]
     SrcQ     = pget(<<"src-queue">>, Def, none),
@@ -441,7 +441,7 @@ get_uris(Key, Def) ->
            end,
     [binary_to_list(URI) || URI <- URIs].
 
-get_unencrypted_uris(Key, Def) ->
+deobfuscated_uris(Key, Def) ->
     ObfuscatedURIs = pget(Key, Def),
     URIs = [credentials_obfuscation:decrypt(ObfuscatedURI) || ObfuscatedURI <- ObfuscatedURIs],
     [binary_to_list(URI) || URI <- URIs].
diff --git a/deps/rabbitmq_shovel/test/parameters_SUITE.erl b/deps/rabbitmq_shovel/test/parameters_SUITE.erl
index 28de7d8315..ee40614983 100644
--- a/deps/rabbitmq_shovel/test/parameters_SUITE.erl
+++ b/deps/rabbitmq_shovel/test/parameters_SUITE.erl
@@ -151,7 +151,7 @@ parse_amqp091_empty_proplists(_Config) ->
 
 
 test_parse_amqp091(Params) ->
-    ObfuscatedParams = rabbit_shovel_parameters:obfuscate_uris_parameters(Params),
+    ObfuscatedParams = rabbit_shovel_parameters:obfuscate_uris_in_definition(Params),
     {ok, Result} = rabbit_shovel_parameters:parse({"vhost", "name"},
                                                   "my-cluster", ObfuscatedParams),
     #{ack_mode := on_publish,
@@ -177,7 +177,7 @@ test_parse_amqp091(Params) ->
     ok.
 
 test_parse_amqp091_with_blank_proprties(Params) ->
-    ObfuscatedParams = rabbit_shovel_parameters:obfuscate_uris_parameters(Params),
+    ObfuscatedParams = rabbit_shovel_parameters:obfuscate_uris_in_definition(Params),
     {ok, Result} = rabbit_shovel_parameters:parse({"vhost", "name"},
                                                   "my-cluster", ObfuscatedParams),
     #{ack_mode := on_publish,
@@ -242,7 +242,7 @@ parse_amqp10(_Config) ->
                                             <<"message-ann-value">>}]},
          {<<"dest-properties">>, [{<<"user_id">>, <<"some-user">>}]}
         ],
-    ObfuscatedParams = rabbit_shovel_parameters:obfuscate_uris_parameters(Params),
+    ObfuscatedParams = rabbit_shovel_parameters:obfuscate_uris_in_definition(Params),
     ?assertMatch(
        {ok, #{name := "my_shovel",
               ack_mode := on_publish,
@@ -279,7 +279,7 @@ parse_amqp10_minimal(_Config) ->
          {<<"dest-uri">>, <<"amqp://remotehost:5672">>},
          {<<"dest-address">>, <<"a-dest-queue">>}
         ],
-    ObfuscatedParams = rabbit_shovel_parameters:obfuscate_uris_parameters(Params),
+    ObfuscatedParams = rabbit_shovel_parameters:obfuscate_uris_in_definition(Params),
     ?assertMatch(
        {ok, #{name := "my_shovel",
               ack_mode := on_confirm,