Skip to content

3.13: correctly format disabled plugins in 'rabbitmq-plugins list' (backport #11197) #11198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 9, 2024
Merged

3.13: correctly format disabled plugins in 'rabbitmq-plugins list' (backport #11197) #11198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4777f7
Don't show disabled plugins as pending upgrade
gomoripeti May 8, 2024
fd3e013
Makes PluginsFormatterTest pass
michaelklishin May 9, 2024
11a10c1
CLI: placate Dialyzer
michaelklishin May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/plugins.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## License, v. 2.0. If a copy of the MPL was not distributed with this
## file, You can obtain one at https://mozilla.org/MPL/2.0/.
##
## Copyright (c) 2007-2023 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved.
## Copyright (c) 2007-2024 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved.
alias RabbitMQ.CLI.Formatters.FormatterHelpers

defmodule RabbitMQ.CLI.Formatters.Plugins do
Expand Down Expand Up @@ -146,10 +146,18 @@ defmodule RabbitMQ.CLI.Formatters.Plugins do
]
end

defp augment_version(%{version: version, running: false}) do
to_string(version)
end

defp augment_version(%{version: version, running_version: nil}) do
to_string(version)
end

defp augment_version(%{version: version, running_version: ""}) do
to_string(version)
end

defp augment_version(%{version: version, running_version: version}) do
to_string(version)
end
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_cli/test/plugins/plugins_formatter_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ defmodule PluginsFormatterTest do
enabled: :implicit,
running: true,
version: ~c"3.7.0",
running_version: nil
running_version: ""
},
%{
name: :mock_rabbitmq_plugins_01,
Expand Down