Skip to content

Fix empty state field in /api/deprecated-features/used endpoint (backport #15042) #15058

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
michaelklishin merged 1 commit into from
Dec 4, 2025
+15 −9
Merged

Fix empty state field in /api/deprecated-features/used endpoint (backport #15042) #15058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions deps/rabbit/src/rabbit_depr_ff_extra.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,17 @@ cli_info0(DeprecatedFeature) ->

App = maps:get(provided_by, FeatureProps),
DeprecationPhase = maps:get(deprecation_phase, FeatureProps, ""),
State = maps:get(state, FeatureProps, ""),
Desc = maps:get(desc, FeatureProps, ""),
DocUrl = maps:get(doc_url, FeatureProps, ""),
Info = #{name => FeatureName,
desc => unicode:characters_to_binary(Desc),
deprecation_phase => DeprecationPhase,
state => State,
doc_url => unicode:characters_to_binary(DocUrl),
provided_by => App},
BaseInfo = #{name => FeatureName,
desc => unicode:characters_to_binary(Desc),
deprecation_phase => DeprecationPhase,
doc_url => unicode:characters_to_binary(DocUrl),
provided_by => App},
Info = maps:merge(BaseInfo,
case maps:find(state, FeatureProps) of
{ok, State} -> #{state => State};
error -> #{}
end),
[Info | Acc]
end, [], lists:sort(maps:keys(DeprecatedFeature))).
7 changes: 5 additions & 2 deletions deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4228,7 +4228,9 @@ list_deprecated_features_test(Config) ->
?assertEqual(<<"permitted_by_default">>, maps:get(deprecation_phase, Feature)),
?assertEqual(atom_to_binary(?MODULE), maps:get(provided_by, Feature)),
?assertEqual(list_to_binary(Desc), maps:get(desc, Feature)),
?assertEqual(list_to_binary(DocUrl), maps:get(doc_url, Feature)).
?assertEqual(list_to_binary(DocUrl), maps:get(doc_url, Feature)),
?assert(maps:is_key(state, Feature)),
?assert(lists:member(maps:get(state, Feature), [<<"permitted">>, <<"denied">>])).

list_used_deprecated_features_test(Config) ->
Desc = "This is a deprecated feature in use",
Expand All @@ -4249,7 +4251,8 @@ list_used_deprecated_features_test(Config) ->
?assertEqual(<<"removed">>, maps:get(deprecation_phase, Feature)),
?assertEqual(atom_to_binary(?MODULE), maps:get(provided_by, Feature)),
?assertEqual(list_to_binary(Desc), maps:get(desc, Feature)),
?assertEqual(list_to_binary(DocUrl), maps:get(doc_url, Feature)).
?assertEqual(list_to_binary(DocUrl), maps:get(doc_url, Feature)),
?assertNot(maps:is_key(state, Feature)).

cluster_and_node_tags_test(Config) ->
Overview = http_get(Config, "/overview"),
Expand Down
Loading