Skip to content

Commit 43292a6

Browse files
Merge pull request #11198 from rabbitmq/mergify/bp/v3.13.x/pr-11197
3.13: correctly format disabled plugins in 'rabbitmq-plugins list' (backport #11197)
2 parents 88be6b4 + 11a10c1 commit 43292a6

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## License, v. 2.0. If a copy of the MPL was not distributed with this
33
## file, You can obtain one at https://mozilla.org/MPL/2.0/.
44
##
5-
## Copyright (c) 2007-2023 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved.
5+
## Copyright (c) 2007-2024 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved.
66
alias RabbitMQ.CLI.Formatters.FormatterHelpers
77

88
defmodule RabbitMQ.CLI.Formatters.Plugins do
@@ -146,10 +146,18 @@ defmodule RabbitMQ.CLI.Formatters.Plugins do
146146
]
147147
end
148148

149+
defp augment_version(%{version: version, running: false}) do
150+
to_string(version)
151+
end
152+
149153
defp augment_version(%{version: version, running_version: nil}) do
150154
to_string(version)
151155
end
152156

157+
defp augment_version(%{version: version, running_version: ""}) do
158+
to_string(version)
159+
end
160+
153161
defp augment_version(%{version: version, running_version: version}) do
154162
to_string(version)
155163
end

deps/rabbitmq_cli/test/plugins/plugins_formatter_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ defmodule PluginsFormatterTest do
7676
enabled: :implicit,
7777
running: true,
7878
version: ~c"3.7.0",
79-
running_version: nil
79+
running_version: ""
8080
},
8181
%{
8282
name: :mock_rabbitmq_plugins_01,

0 commit comments

Comments
 (0)