Merge pull request #9958 from rabbitmq/mergify/bp/v3.11.x/pr-9957

Revert elixir json switch (backport #9952) (backport #9957)

Author: michaelklishin

BUILD.bazel

@@ -53,6 +53,7 @@ exports_files([
 # gazelle:exclude deps/gun
 # gazelle:exclude deps/inet_tcp_proxy
 # gazelle:exclude deps/jose
+# gazelle:exclude deps/json
 # gazelle:exclude deps/meck
 # gazelle:exclude deps/observer_cli
 # gazelle:exclude deps/osiris

MODULE.bazel

@@ -267,6 +267,13 @@ erlang_package.git_package(
     repository = "michaelklishin/erlang-jose",
 )
 
+erlang_package.hex_package(
+    name = "json",
+    build_file = "@rabbitmq-server//bazel:BUILD.json",
+    sha256 = "9abf218dbe4ea4fcb875e087d5f904ef263d012ee5ed21d46e9dbca63f053d16",
+    version = "1.4.1",
+)
+
 erlang_package.hex_package(
     name = "thoas",
     build_file = "@rabbitmq-server//bazel:BUILD.thoas",
@@ -361,6 +368,7 @@ use_repo(
     "getopt",
     "gun",
     "jose",
+    "json",
     "observer_cli",
     "prometheus",
     "ranch",

Makefile

@@ -41,6 +41,8 @@ XREF_EXTRA_APP_DIRS = $(filter-out deps/rabbitmq_cli/_build/dev/lib/rabbit_commo
 # protocols directly.
 XREF_IGNORE = [ \
     {'Elixir.CSV.Encode',impl_for,1}, \
+    {'Elixir.JSON.Decoder',impl_for,1}, \
+    {'Elixir.JSON.Encoder',impl_for,1}, \
     {'Elixir.RabbitMQ.CLI.Core.DataCoercion',impl_for,1}]
 
 # Include Elixir libraries in the Xref checks.

deps/rabbitmq_cli/BUILD.bazel

@@ -17,6 +17,13 @@ mix_archive_build(
     archives = ["@hex//:archive"],
 )
 
+mix_archive_build(
+    name = "json_ez",
+    srcs = ["@json//:sources"],
+    out = "json.ez",
+    archives = ["@hex//:archive"],
+)
+
 # Note: All the various rabbitmq-* scripts are just copies of rabbitmqctl
 rabbitmqctl(
     name = "rabbitmqctl",
@@ -32,6 +39,7 @@ rabbitmqctl(
     license_files = glob(["LICENSE*"]),
     source_deps = {
         "@csv//:sources": "csv",
+        "@json//:sources": "json",
     },
     visibility = ["//visibility:public"],
     deps = [
@@ -101,6 +109,7 @@ plt(
     ],
     ez_deps = [
         ":csv_ez",
+        ":json_ez",
     ],
     ignore_warnings = True,
     libs = [":elixir"],
@@ -142,6 +151,7 @@ rabbitmqctl_test(
     source_deps = {
         "@amqp//:sources": "amqp",
         "@csv//:sources": "csv",
+        "@json//:sources": "json",
         "@temp//:sources": "temp",
         "@x509//:sources": "x509",
     },

deps/rabbitmq_cli/Makefile

@@ -1,11 +1,12 @@
 PROJECT = rabbitmq_cli
 
 BUILD_DEPS = rabbit_common
-DEPS = csv observer_cli stdout_formatter
+DEPS = csv json observer_cli stdout_formatter
 TEST_DEPS = amqp amqp_client temp x509 rabbit
 
 dep_amqp = hex 3.3.0
 dep_csv = hex 3.2.0
+dep_json = hex 1.4.1
 dep_temp = hex 0.4.7
 dep_x509 = hex 0.8.8
 

deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/export_definitions_command.ex

@@ -159,7 +159,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ExportDefinitionsCommand do
         end)
       end)
 
-    {:ok, json} = :rabbit_json.try_encode(map)
+    {:ok, json} = JSON.encode(map)
     json
   end
 

deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/import_definitions_command.ex

@@ -166,7 +166,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ImportDefinitionsCommand do
   #
 
   defp deserialise(bin, "json") do
-    :rabbit_json.try_decode(bin)
+    JSON.decode(bin)
   end
 
   defp deserialise(bin, "erlang") do

deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_user_limits_command.ex

@@ -36,7 +36,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListUserLimitsCommand do
 
       val ->
         Enum.map(val, fn {user, val} ->
-          {:ok, val_encoded} = :rabbit_json.try_encode(Map.new(val))
+          {:ok, val_encoded} = JSON.encode(Map.new(val))
           [user: user, limits: val_encoded]
         end)
     end
@@ -56,7 +56,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListUserLimitsCommand do
         {:badrpc, node}
 
       val when is_list(val) or is_map(val) ->
-        {:ok, val_encoded} = :rabbit_json.try_encode(Map.new(val))
+        {:ok, val_encoded} = JSON.encode(Map.new(val))
         val_encoded
     end
   end

deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_vhost_limits_command.ex

@@ -36,7 +36,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListVhostLimitsCommand do
 
       val ->
         Enum.map(val, fn {vhost, val} ->
-          {:ok, val_encoded} = :rabbit_json.try_encode(Map.new(val))
+          {:ok, val_encoded} = JSON.encode(Map.new(val))
           [vhost: vhost, limits: val_encoded]
         end)
     end
@@ -54,7 +54,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListVhostLimitsCommand do
         {:badrpc, node}
 
       val when is_list(val) or is_map(val) ->
-        :rabbit_json.try_encode(Map.new(val))
+        JSON.encode(Map.new(val))
     end
   end
 

deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex

@@ -18,7 +18,7 @@ defmodule RabbitMQ.CLI.Formatters.Json do
   end
 
   def format_output(output, _opts) do
-    {:ok, json} = :rabbit_json.try_encode(keys_to_atoms(output))
+    {:ok, json} = JSON.encode(keys_to_atoms(output))
     json
   end