Merge pull request #10256 from ariel-anieli/issue-2640-client--properties-also-maps

[2640] client_properties accepted as either a proplists, or a map

Author: michaelklishin

deps/amqp_client/src/amqp_connection.erl

@@ -88,8 +88,10 @@
 %% <li>node :: atom() - The node the broker runs on (direct only)</li>
 %% <li>adapter_info :: amqp_adapter_info() - Extra management information for if
 %%     this connection represents a non-AMQP network connection.</li>
-%% <li>client_properties :: [{binary(), atom(), binary()}] - A list of extra
-%%     client properties to be sent to the server, defaults to []</li>
+%% <li>client_properties :: [{binary(), atom(), binary()}]
+%%                          | #{binary() => binary()}
+%%     - A list (or a map) of extra client properties to be sent to the server,
+%%      defaults to []</li>
 %% </ul>
 %%
 %% @type amqp_params_network() = #amqp_params_network{}.
@@ -116,8 +118,10 @@
 %%     defaults to 30000 (network only)</li>
 %% <li>ssl_options :: term() - The second parameter to be used with the
 %%     ssl:connect/2 function, defaults to 'none' (network only)</li>
-%% <li>client_properties :: [{binary(), atom(), binary()}] - A list of extra
-%%     client properties to be sent to the server, defaults to []</li>
+%% <li>client_properties :: [{binary(), atom(), binary()}]
+%%                          | #{binary() => binary()}
+%%     - A list (or a map) of extra client properties to be sent to the server,
+%%      defaults to []</li>
 %% <li>socket_options :: [any()] - Extra socket options.  These are
 %%     appended to the default options.  See
 %%     <a href="https://www.erlang.org/doc/man/inet.html#setopts-2">inet:setopts/2</a>
@@ -155,10 +159,12 @@ start(AmqpParams, ConnName) when ConnName == undefined; is_binary(ConnName) ->
     ensure_started(),
     AmqpParams0 =
         case AmqpParams of
-            #amqp_params_direct{password = Password} ->
-                AmqpParams#amqp_params_direct{password = credentials_obfuscation:encrypt(Password)};
-            #amqp_params_network{password = Password} ->
-                AmqpParams#amqp_params_network{password = credentials_obfuscation:encrypt(Password)}
+            #amqp_params_direct{password = Password, client_properties = Props} ->
+                AmqpParams#amqp_params_direct{password          = credentials_obfuscation:encrypt(Password),
+                                              client_properties = rabbit_data_coercion:to_proplist(Props)};
+            #amqp_params_network{password = Password, client_properties = Props} ->
+                AmqpParams#amqp_params_network{password          = credentials_obfuscation:encrypt(Password),
+                                               client_properties = rabbit_data_coercion:to_proplist(Props)}
         end,
     AmqpParams1 =
         case AmqpParams0 of