diff --git a/command/common/internal/help_all_display.go b/command/common/internal/help_all_display.go index f2dbcc4c98..9090f70f46 100644 --- a/command/common/internal/help_all_display.go +++ b/command/common/internal/help_all_display.go @@ -17,6 +17,7 @@ var HelpCategoryList = []HelpCategory{ {"start", "stop", "restart", "stage-package", "restage", "restart-app-instance"}, {"run-task", "tasks", "terminate-task"}, {"packages", "create-package"}, + {"revisions", "rollback"}, {"droplets", "set-droplet", "download-droplet"}, {"events", "logs"}, {"env", "set-env", "unset-env"}, @@ -172,7 +173,7 @@ var ExperimentalHelpCategoryList = []HelpCategory{ { CategoryName: "EXPERIMENTAL COMMANDS:", CommandList: [][]string{ - {"revisions", "revision", "rollback"}, + {"revision"}, }, }, } diff --git a/command/v7/revisions_command.go b/command/v7/revisions_command.go index d2b1b87b9b..2c309350b6 100644 --- a/command/v7/revisions_command.go +++ b/command/v7/revisions_command.go @@ -5,7 +5,6 @@ import ( "strconv" "code.cloudfoundry.org/cli/actor/v7action" - "code.cloudfoundry.org/cli/command" "code.cloudfoundry.org/cli/command/flag" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/ui" @@ -26,9 +25,6 @@ type RevisionsCommand struct { } func (cmd RevisionsCommand) Execute(_ []string) error { - cmd.UI.DisplayWarning(command.ExperimentalWarning) - cmd.UI.DisplayNewline() - err := cmd.SharedActor.CheckTarget(true, true) if err != nil { return err diff --git a/command/v7/revisions_command_test.go b/command/v7/revisions_command_test.go index e7a7987ea4..6af5b8ff3d 100644 --- a/command/v7/revisions_command_test.go +++ b/command/v7/revisions_command_test.go @@ -59,10 +59,6 @@ var _ = Describe("revisions Command", func() { executeErr = cmd.Execute(nil) }) - It("displays the experimental warning", func() { - Expect(testUI.Err).To(Say("This command is in EXPERIMENTAL stage and may change without notice")) - }) - When("checking target fails", func() { BeforeEach(func() { fakeSharedActor.CheckTargetReturns(actionerror.NotLoggedInError{BinaryName: binaryName}) diff --git a/command/v7/rollback_command.go b/command/v7/rollback_command.go index 14854c42a3..29c7c2e716 100644 --- a/command/v7/rollback_command.go +++ b/command/v7/rollback_command.go @@ -38,9 +38,6 @@ func (cmd *RollbackCommand) Setup(config command.Config, ui command.UI) error { } func (cmd RollbackCommand) Execute(args []string) error { - cmd.UI.DisplayWarning(command.ExperimentalWarning) - cmd.UI.DisplayNewline() - targetRevision := int(cmd.Version.Value) err := cmd.SharedActor.CheckTarget(true, true) if err != nil { diff --git a/command/v7/rollback_command_test.go b/command/v7/rollback_command_test.go index 9edcfc564a..3218d02a9b 100644 --- a/command/v7/rollback_command_test.go +++ b/command/v7/rollback_command_test.go @@ -85,10 +85,6 @@ var _ = Describe("rollback Command", func() { executeErr = cmd.Execute(nil) }) - It("displays the experimental warning", func() { - Expect(testUI.Err).To(Say("This command is in EXPERIMENTAL stage and may change without notice")) - }) - When("checking target fails", func() { BeforeEach(func() { fakeSharedActor.CheckTargetReturns(actionerror.NoOrganizationTargetedError{BinaryName: binaryName}) diff --git a/integration/v7/isolated/revisions_command_test.go b/integration/v7/isolated/revisions_command_test.go index c5816d0aa8..952654b1b7 100644 --- a/integration/v7/isolated/revisions_command_test.go +++ b/integration/v7/isolated/revisions_command_test.go @@ -33,7 +33,7 @@ var _ = Describe("revisions command", func() { It("appears in cf help -a", func() { session := helpers.CF("help", "-a") Eventually(session).Should(Exit(0)) - Expect(session).To(HaveCommandInCategoryWithDescription("revisions", "EXPERIMENTAL COMMANDS", "List revisions of an app")) + Expect(session).To(HaveCommandInCategoryWithDescription("revisions", "APPS", "List revisions of an app")) }) It("Displays command usage to output", func() { diff --git a/integration/v7/isolated/rollback_command_test.go b/integration/v7/isolated/rollback_command_test.go index 056c2115b9..3e8bf1eb0c 100644 --- a/integration/v7/isolated/rollback_command_test.go +++ b/integration/v7/isolated/rollback_command_test.go @@ -21,7 +21,7 @@ var _ = Describe("rollback command", func() { It("appears in cf help -a", func() { session := helpers.CF("help", "-a") Eventually(session).Should(Exit(0)) - Expect(session).To(HaveCommandInCategoryWithDescription("rollback", "EXPERIMENTAL COMMANDS", "Rollback to the specified revision of an app")) + Expect(session).To(HaveCommandInCategoryWithDescription("rollback", "APPS", "Rollback to the specified revision of an app")) }) It("Displays rollback command usage to output", func() {