Merge pull request #10510 from esl/remove-delivery-mode-2

Remove delivery_mode header from amqp 1.0 shovel.

Author: michaelklishin

deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl

@@ -390,6 +390,11 @@ set_message_properties(Props, Msg) ->
                 #{content_encoding => to_binary(Ct)}, M);
          (delivery_mode, 2, M) ->
               amqp10_msg:set_headers(#{durable => true}, M);
+         (delivery_mode, 1, M) ->
+              % by default the durable flag is false
+              M;
+         (priority, P, M) when is_integer(P) ->
+                amqp10_msg:set_headers(#{priority => P}, M);
          (correlation_id, Ct, M) ->
               amqp10_msg:set_properties(#{correlation_id => to_binary(Ct)}, M);
          (reply_to, Ct, M) ->

deps/rabbitmq_shovel/test/amqp10_dynamic_SUITE.erl

@@ -131,12 +131,15 @@ test_amqp10_destination(Config, Src, Dest, Sess, Protocol, ProtocolSrc) ->
                                            <<"message-ann-value">>}]
                                   end}]),
     Msg = publish_expect(Sess, Src, Dest, <<"tag1">>, <<"hello">>),
+    AppProps = amqp10_msg:application_properties(Msg),
+
     ?assertMatch((#{user_id := <<"guest">>, creation_time := _}),
                  (amqp10_msg:properties(Msg))),
     ?assertMatch((#{<<"shovel-name">> := <<"test">>,
                     <<"shovel-type">> := <<"dynamic">>, <<"shovelled-by">> := _,
                     <<"app-prop-key">> := <<"app-prop-value">>}),
-                 (amqp10_msg:application_properties(Msg))),
+                 (AppProps)),
+    ?assertEqual(undefined, maps:get(<<"delivery_mode">>, AppProps, undefined)),
     ?assertMatch((#{<<"message-ann-key">> := <<"message-ann-value">>}),
                  (amqp10_msg:message_annotations(Msg))).