Skip to content

Commit 8db0414

Browse files
mkuratczykmergify[bot]
authored andcommitted
Rename --force to --experimental
Plus, a slightly more scary error message (cherry picked from commit e3302f2)
1 parent 6fae57e commit 8db0414

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
defmodule RabbitMQ.CLI.Ctl.Commands.EnableFeatureFlagCommand do
88
@behaviour RabbitMQ.CLI.CommandBehaviour
99

10-
def switches(), do: [force: :boolean]
11-
def aliases(), do: [f: :force]
10+
def switches(), do: [experimental: :boolean]
11+
def aliases(), do: [f: :experimental]
1212

13-
def merge_defaults(args, opts), do: { args, Map.merge(%{force: false}, opts) }
13+
def merge_defaults(args, opts), do: { args, Map.merge(%{experimental: false}, opts) }
1414

1515
def validate([], _opts), do: {:validation_failure, :not_enough_args}
1616
def validate([_ | _] = args, _opts) when length(args) > 1, do: {:validation_failure, :too_many_args}
@@ -32,14 +32,14 @@ defmodule RabbitMQ.CLI.Ctl.Commands.EnableFeatureFlagCommand do
3232
end
3333
end
3434

35-
def run([feature_flag], %{node: node_name, force: force}) do
36-
case {force, :rabbit_misc.rpc_call(node_name, :rabbit_feature_flags, :get_stability, [
35+
def run([feature_flag], %{node: node_name, experimental: experimental}) do
36+
case {experimental, :rabbit_misc.rpc_call(node_name, :rabbit_feature_flags, :get_stability, [
3737
String.to_atom(feature_flag)
3838
])} do
3939
{_, {:badrpc, {:EXIT, {:undef, _}}}} -> {:error, :unsupported}
4040
{_, {:badrpc, _} = err} -> err
4141
{false, :experimental} ->
42-
IO.puts("Feature flag #{feature_flag} is experimental and requires --force to enable it.")
42+
IO.puts("Feature flag #{feature_flag} is experimental. If you understand the risk, use --experimental to enable it.")
4343
_ ->
4444
case :rabbit_misc.rpc_call(node_name, :rabbit_feature_flags, :enable, [
4545
String.to_atom(feature_flag)
@@ -60,7 +60,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.EnableFeatureFlagCommand do
6060

6161
use RabbitMQ.CLI.DefaultOutput
6262

63-
def usage, do: "enable_feature_flag [--force] <all | feature_flag>"
63+
def usage, do: "enable_feature_flag [--experimental] <all | feature_flag>"
6464

6565
def usage_additional() do
6666
[
@@ -69,7 +69,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.EnableFeatureFlagCommand do
6969
"name of the feature flag to enable, or \"all\" to enable all supported flags"
7070
],
7171
[
72-
"--force",
72+
"--experimental",
7373
"required to enable experimental feature flags (make sure you understand the risks!))"
7474
]
7575
]

deps/rabbitmq_cli/test/ctl/enable_feature_flag_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ defmodule EnableFeatureFlagCommandTest do
3535

3636
{
3737
:ok,
38-
opts: %{node: get_rabbit_hostname(), force: false}, feature_flag: @feature_flag
38+
opts: %{node: get_rabbit_hostname(), experimental: false}, feature_flag: @feature_flag
3939
}
4040
end
4141

@@ -59,7 +59,7 @@ defmodule EnableFeatureFlagCommandTest do
5959
end
6060

6161
test "run: attempt to use an unreachable node returns a nodedown" do
62-
opts = %{node: :jake@thedog, timeout: 200, force: false}
62+
opts = %{node: :jake@thedog, timeout: 200, experimental: false}
6363
assert match?({:badrpc, _}, @command.run(["na"], opts))
6464
end
6565

0 commit comments

Comments
 (0)