Merge pull request #13365 from rabbitmq/cow-uri

Delete rabbit_uri

Author: michaelklishin

deps/rabbit/Makefile

@@ -129,7 +129,7 @@ endef
 LOCAL_DEPS = sasl os_mon inets compiler public_key crypto ssl syntax_tools xmerl
 
 BUILD_DEPS = rabbitmq_cli
-DEPS = ranch rabbit_common amqp10_common rabbitmq_prelaunch ra sysmon_handler stdout_formatter recon redbug observer_cli osiris syslog systemd seshat horus khepri khepri_mnesia_migration cuttlefish gen_batch_server
+DEPS = ranch cowlib rabbit_common amqp10_common rabbitmq_prelaunch ra sysmon_handler stdout_formatter recon redbug observer_cli osiris syslog systemd seshat horus khepri khepri_mnesia_migration cuttlefish gen_batch_server
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers meck proper amqp_client rabbitmq_amqp_client rabbitmq_amqp1_0
 
 # We pin a version of Horus even if we don't use it directly (it is a

deps/rabbit/src/rabbit_amqp_management.erl

@@ -80,7 +80,7 @@ handle_http_req(<<"GET">>,
                 _User,
                 _ConnPid,
                 PermCaches) ->
-    QNameBin = rabbit_uri:urldecode(QNameBinQuoted),
+    QNameBin = cow_uri:urldecode(QNameBinQuoted),
     QName = queue_resource(Vhost, QNameBin),
     case rabbit_amqqueue:with(
            QName,
@@ -110,7 +110,7 @@ handle_http_req(HttpMethod = <<"PUT">>,
       exclusive := Exclusive,
       arguments := QArgs0
      } = decode_queue(ReqPayload),
-    QNameBin = rabbit_uri:urldecode(QNameBinQuoted),
+    QNameBin = cow_uri:urldecode(QNameBinQuoted),
     Owner = case Exclusive of
                 true -> ConnPid;
                 false -> none
@@ -190,7 +190,7 @@ handle_http_req(<<"PUT">>,
                 User = #user{username = Username},
                 _ConnPid,
                 {PermCache0, TopicPermCache}) ->
-    XNameBin = rabbit_uri:urldecode(XNameBinQuoted),
+    XNameBin = cow_uri:urldecode(XNameBinQuoted),
     #{type := XTypeBin,
       durable := Durable,
       auto_delete := AutoDelete,
@@ -240,7 +240,7 @@ handle_http_req(<<"DELETE">>,
                 User,
                 ConnPid,
                 {PermCache0, TopicPermCache}) ->
-    QNameBin = rabbit_uri:urldecode(QNameBinQuoted),
+    QNameBin = cow_uri:urldecode(QNameBinQuoted),
     QName = queue_resource(Vhost, QNameBin),
     PermCache = check_resource_access(QName, read, User, PermCache0),
     try rabbit_amqqueue:with_exclusive_access_or_die(
@@ -270,7 +270,7 @@ handle_http_req(<<"DELETE">>,
                 User = #user{username = Username},
                 ConnPid,
                 {PermCache0, TopicPermCache}) ->
-    QNameBin = rabbit_uri:urldecode(QNameBinQuoted),
+    QNameBin = cow_uri:urldecode(QNameBinQuoted),
     QName = queue_resource(Vhost, QNameBin),
     ok = prohibit_cr_lf(QNameBin),
     PermCache = check_resource_access(QName, configure, User, PermCache0),
@@ -290,7 +290,7 @@ handle_http_req(<<"DELETE">>,
                 User = #user{username = Username},
                 _ConnPid,
                 {PermCache0, TopicPermCache}) ->
-    XNameBin = rabbit_uri:urldecode(XNameBinQuoted),
+    XNameBin = cow_uri:urldecode(XNameBinQuoted),
     XName = exchange_resource(Vhost, XNameBin),
     ok = prohibit_cr_lf(XNameBin),
     ok = prohibit_default_exchange(XName),
@@ -630,9 +630,9 @@ decode_binding_path_segment(Segment) ->
          end,
     case re:run(Segment, MP, [{capture, all_but_first, binary}]) of
         {match, [SrcQ, <<DstKindChar>>, DstQ, KeyQ, ArgsHash]} ->
-            Src = rabbit_uri:urldecode(SrcQ),
-            Dst = rabbit_uri:urldecode(DstQ),
-            Key = rabbit_uri:urldecode(KeyQ),
+            Src = cow_uri:urldecode(SrcQ),
+            Dst = cow_uri:urldecode(DstQ),
+            Key = cow_uri:urldecode(KeyQ),
             DstKind = destination_char_to_kind(DstKindChar),
             {Src, DstKind, Dst, Key, ArgsHash};
         nomatch ->

deps/rabbit/src/rabbit_amqp_session.erl

@@ -2699,7 +2699,7 @@ ensure_source(Source = #'v1_0.source'{address = Address,
         {utf8, <<"/queues/", QNameBinQuoted/binary>>} ->
             %% The only possible v2 source address format is:
             %%  /queues/:queue
-            try rabbit_uri:urldecode(QNameBinQuoted) of
+            try cow_uri:urldecode(QNameBinQuoted) of
                 QNameBin ->
                     QName = queue_resource(Vhost, QNameBin),
                     ok = exit_if_absent(QName),
@@ -2907,11 +2907,11 @@ parse_target_v2_string0(<<"/exchanges/", Rest/binary>>) ->
         [<<"amq.default">> | _] ->
             {error, bad_address};
         [XNameBinQuoted] ->
-            XNameBin = rabbit_uri:urldecode(XNameBinQuoted),
+            XNameBin = cow_uri:urldecode(XNameBinQuoted),
             {ok, XNameBin, <<>>, undefined};
         [XNameBinQuoted, RKeyQuoted] ->
-            XNameBin = rabbit_uri:urldecode(XNameBinQuoted),
-            RKey = rabbit_uri:urldecode(RKeyQuoted),
+            XNameBin = cow_uri:urldecode(XNameBinQuoted),
+            RKey = cow_uri:urldecode(RKeyQuoted),
             {ok, XNameBin, RKey, undefined};
         _ ->
             {error, bad_address}
@@ -2920,7 +2920,7 @@ parse_target_v2_string0(<<"/queues/">>) ->
     %% empty queue name is invalid
     {error, bad_address};
 parse_target_v2_string0(<<"/queues/", QNameBinQuoted/binary>>) ->
-    QNameBin = rabbit_uri:urldecode(QNameBinQuoted),
+    QNameBin = cow_uri:urldecode(QNameBinQuoted),
     {ok, ?DEFAULT_EXCHANGE_NAME, QNameBin, QNameBin};
 parse_target_v2_string0(_) ->
     {error, bad_address}.

deps/rabbit/src/rabbit_uri.erl

@@ -92,7 +92,7 @@ convert_from(mc_amqp, Sections, Env) ->
                            MqttX:(byte_size(MqttX))/binary,
                            "/",
                            RoutingKeyQuoted/binary>> ->
-                             try rabbit_uri:urldecode(RoutingKeyQuoted) of
+                             try cow_uri:urldecode(RoutingKeyQuoted) of
                                  RoutingKey ->
                                      MqttTopic = rabbit_mqtt_util:amqp_to_mqtt(RoutingKey),
                                      #{'Response-Topic' => MqttTopic}