From 2e1fcbe579b4617ecd0be8a002eceaf7b87a72e3 Mon Sep 17 00:00:00 2001 From: Yavor16 Date: Fri, 12 Sep 2025 15:43:37 +0300 Subject: [PATCH 1/2] Remove experimental words from help command LMCROSSITXSADEPLOY-3276 --- commands/blue_green_deploy_command.go | 12 ++++++------ commands/deploy_command.go | 20 ++++++++++---------- commands/mta_command.go | 2 +- commands/rollback_mta_command.go | 2 +- commands/undeploy_command.go | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/commands/blue_green_deploy_command.go b/commands/blue_green_deploy_command.go index ca3f174..9bcb7e5 100644 --- a/commands/blue_green_deploy_command.go +++ b/commands/blue_green_deploy_command.go @@ -45,11 +45,11 @@ func (c *BlueGreenDeployCommand) GetPluginCommand() plugin.Command { actionOpt: "Action to perform on active deploy operation (abort, retry, resume, monitor)", forceOpt: "Force deploy without confirmation for aborting conflicting processes", util.GetShortOption(noStartOpt): "Do not start apps", - util.GetShortOption(namespaceOpt): "(EXPERIMENTAL) Namespace for the MTA, applied on app names, app routes and service names", - util.GetShortOption(applyNamespaceAppNamesOpt): "(EXPERIMENTAL) Apply namespace to application names: (true, false)", - util.GetShortOption(applyNamespaceServiceNamesOpt): "(EXPERIMENTAL) Apply namespace to service names: (true, false)", - util.GetShortOption(applyNamespaceAppRoutesOpt): "(EXPERIMENTAL) Apply namespace to application routes: (true, false)", - util.GetShortOption(applyNamespaceAsSuffix): "(EXPERIMENTAL) Apply namespace as a suffix rather than a prefix: (true, false)", + util.GetShortOption(namespaceOpt): "Namespace for the MTA, applied on app names, app routes and service names", + util.GetShortOption(applyNamespaceAppNamesOpt): "Apply namespace to application names: (true, false)", + util.GetShortOption(applyNamespaceServiceNamesOpt): "Apply namespace to service names: (true, false)", + util.GetShortOption(applyNamespaceAppRoutesOpt): "Apply namespace to application routes: (true, false)", + util.GetShortOption(applyNamespaceAsSuffix): "Apply namespace as a suffix rather than a prefix: (true, false)", util.GetShortOption(deleteServicesOpt): "Recreate changed services / delete discontinued services", util.GetShortOption(deleteServiceKeysOpt): "Delete existing service keys and apply the new ones", util.GetShortOption(deleteServiceBrokersOpt): "Delete discontinued service brokers", @@ -64,7 +64,7 @@ func (c *BlueGreenDeployCommand) GetPluginCommand() plugin.Command { util.GetShortOption(uploadTimeoutOpt): "Upload app timeout in seconds", util.GetShortOption(taskExecutionTimeoutOpt): "Task execution timeout in seconds", util.CombineFullAndShortParameters(startTimeoutOpt, timeoutOpt): "Start app timeout in seconds", - util.GetShortOption(shouldBackupPreviousVersionOpt): "(EXPERIMENTAL) Backup previous version of applications, use new cli command \"rollback-mta\" to rollback to the previous version", + util.GetShortOption(shouldBackupPreviousVersionOpt): "Backup previous version of applications, use new cli command \"rollback-mta\" to rollback to the previous version", }, }, } diff --git a/commands/deploy_command.go b/commands/deploy_command.go index a9bab3d..a2bccc4 100644 --- a/commands/deploy_command.go +++ b/commands/deploy_command.go @@ -110,7 +110,7 @@ func (c *DeployCommand) GetPluginCommand() plugin.Command { Perform action on an active deploy operation cf deploy -i OPERATION_ID -a ACTION [-u URL] - (EXPERIMENTAL) Deploy a multi-target app archive referenced by a remote URL + Deploy a multi-target app archive referenced by a remote URL | cf deploy [-e EXT_DESCRIPTOR[,...]] [-t TIMEOUT] [--version-rule VERSION_RULE] [-u MTA_CONTROLLER_URL] [--retries RETRIES] [--no-start] [--namespace NAMESPACE] [--apply-namespace-app-names true/false] [--apply-namespace-service-names true/false] [--apply-namespace-app-routes true/false] [--apply-namespace-as-suffix true/false ] [--delete-services] [--delete-service-keys] [--delete-service-brokers] [--keep-files] [--no-restart-subscribed-apps] [--do-not-fail-on-missing-permissions] [--abort-on-error] [--strategy STRATEGY] [--skip-testing-phase] [--skip-idle-start] [--apps-start-timeout TIMEOUT] [--apps-stage-timeout TIMEOUT] [--apps-upload-timeout TIMEOUT] [--apps-task-execution-timeout TIMEOUT]` + util.UploadEnvHelpText, Options: map[string]string{ @@ -123,11 +123,11 @@ func (c *DeployCommand) GetPluginCommand() plugin.Command { moduleOpt: "Deploy list of modules which are contained in the deployment descriptor, in the current location", resourceOpt: "Deploy list of resources which are contained in the deployment descriptor, in the current location", util.GetShortOption(noStartOpt): "Do not start apps", - util.GetShortOption(namespaceOpt): "(EXPERIMENTAL) Namespace for the MTA, applied on app names, app routes and service names", - util.GetShortOption(applyNamespaceAppNamesOpt): "(EXPERIMENTAL) Apply namespace to application names: (true, false)", - util.GetShortOption(applyNamespaceServiceNamesOpt): "(EXPERIMENTAL) Apply namespace to service names: (true, false)", - util.GetShortOption(applyNamespaceAppRoutesOpt): "(EXPERIMENTAL) Apply namespace to application routes: (true, false)", - util.GetShortOption(applyNamespaceAsSuffix): "(EXPERIMENTAL) Apply namespace as a suffix rather than a prefix: (true, false)", + util.GetShortOption(namespaceOpt): "Namespace for the MTA, applied on app names, app routes and service names", + util.GetShortOption(applyNamespaceAppNamesOpt): "Apply namespace to application names: (true, false)", + util.GetShortOption(applyNamespaceServiceNamesOpt): "Apply namespace to service names: (true, false)", + util.GetShortOption(applyNamespaceAppRoutesOpt): "Apply namespace to application routes: (true, false)", + util.GetShortOption(applyNamespaceAsSuffix): "Apply namespace as a suffix rather than a prefix: (true, false)", util.GetShortOption(deleteServicesOpt): "Recreate changed services / delete discontinued services", util.GetShortOption(deleteServiceKeysOpt): "Delete existing service keys and apply the new ones", util.GetShortOption(deleteServiceBrokersOpt): "Delete discontinued service brokers", @@ -138,14 +138,14 @@ func (c *DeployCommand) GetPluginCommand() plugin.Command { util.GetShortOption(allModulesOpt): "Deploy all modules which are contained in the deployment descriptor, in the current location", util.GetShortOption(allResourcesOpt): "Deploy all resources which are contained in the deployment descriptor, in the current location", util.GetShortOption(retriesOpt): "Retry the operation N times in case a non-content error occurs (default 3)", - util.GetShortOption(strategyOpt): "Specify the deployment strategy when updating an mta (default, blue-green, (EXPERIMENTAL) incremental-blue-green)", - util.GetShortOption(skipTestingPhase): "(STRATEGY: BLUE-GREEN, (EXPERIMENTAL) INCREMENTAL-BLUE-GREEN) Do not require confirmation for deleting the previously deployed MTA app", - util.GetShortOption(skipIdleStart): "(STRATEGY: BLUE-GREEN, (EXPERIMENTAL) INCREMENTAL-BLUE-GREEN) Directly start the new MTA version as 'live', skipping the 'idle' phase of the resources. Do not require further confirmation or testing before deleting the old version", + util.GetShortOption(strategyOpt): "Specify the deployment strategy when updating an mta (default, blue-green, incremental-blue-green)", + util.GetShortOption(skipTestingPhase): "(STRATEGY: BLUE-GREEN, INCREMENTAL-BLUE-GREEN) Do not require confirmation for deleting the previously deployed MTA app", + util.GetShortOption(skipIdleStart): "(STRATEGY: BLUE-GREEN, INCREMENTAL-BLUE-GREEN) Directly start the new MTA version as 'live', skipping the 'idle' phase of the resources. Do not require further confirmation or testing before deleting the old version", util.GetShortOption(stageTimeoutOpt): "Stage app timeout in seconds", util.GetShortOption(uploadTimeoutOpt): "Upload app timeout in seconds", util.GetShortOption(taskExecutionTimeoutOpt): "Task execution timeout in seconds", util.CombineFullAndShortParameters(startTimeoutOpt, timeoutOpt): "Start app timeout in seconds", - util.GetShortOption(shouldBackupPreviousVersionOpt): "(STRATEGY: BLUE-GREEN, (EXPERIMENTAL) INCREMENTAL-BLUE-GREEN) Backup previous version of applications, use new cli command \"rollback-mta\" to rollback to the previous version", + util.GetShortOption(shouldBackupPreviousVersionOpt): "(STRATEGY: BLUE-GREEN, INCREMENTAL-BLUE-GREEN) Backup previous version of applications, use new cli command \"rollback-mta\" to rollback to the previous version", }, }, } diff --git a/commands/mta_command.go b/commands/mta_command.go index 5283423..b1ffa90 100644 --- a/commands/mta_command.go +++ b/commands/mta_command.go @@ -45,7 +45,7 @@ func (c *MtaCommand) GetPluginCommand() plugin.Command { UsageDetails: plugin.Usage{ Usage: "cf mta MTA_ID [--namespace NAMESPACE] [-u URL]" + util.BaseEnvHelpText, Options: map[string]string{ - util.GetShortOption(namespaceOpt): "(EXPERIMENTAL) namespace of the requested mta, empty by default", + util.GetShortOption(namespaceOpt): "namespace of the requested mta, empty by default", deployServiceURLOpt: "Deploy service URL, by default 'deploy-service.'", }, }, diff --git a/commands/rollback_mta_command.go b/commands/rollback_mta_command.go index 9d8e24c..d7f657d 100644 --- a/commands/rollback_mta_command.go +++ b/commands/rollback_mta_command.go @@ -45,7 +45,7 @@ func (c *RollbackMtaCommand) GetPluginCommand() plugin.Command { operationIDOpt: "Active deploy operation ID", actionOpt: "Action to perform on active deploy operation (abort, retry, resume, monitor)", forceOpt: "Force deploy without confirmation for aborting conflicting processes", - util.GetShortOption(namespaceOpt): "(EXPERIMENTAL) Namespace for the MTA, applied on app names, app routes and service names", + util.GetShortOption(namespaceOpt): "Namespace for the MTA, applied on app names, app routes and service names", util.GetShortOption(deleteServicesOpt): "Recreate changed services / delete discontinued services", util.GetShortOption(noFailOnMissingPermissionsOpt): "Do not fail on missing permissions for admin operations", util.GetShortOption(abortOnErrorOpt): "Auto-abort the process on any errors", diff --git a/commands/undeploy_command.go b/commands/undeploy_command.go index 7e8ab13..ee57193 100644 --- a/commands/undeploy_command.go +++ b/commands/undeploy_command.go @@ -51,7 +51,7 @@ func (c *UndeployCommand) GetPluginCommand() plugin.Command { util.GetShortOption(noFailOnMissingPermissionsOpt): "Do not fail on missing permissions for admin operations", util.GetShortOption(abortOnErrorOpt): "Auto-abort the process on any errors", util.GetShortOption(retriesOpt): "Retry the operation N times in case a non-content error occurs (default 3)", - util.GetShortOption(namespaceOpt): "(EXPERIMENTAL) Specify the (optional) namespace the target mta is in", + util.GetShortOption(namespaceOpt): "Specify the (optional) namespace the target mta is in", }, }, } From 84f9028dad80ecd6f878274e459e7b102ea197a6 Mon Sep 17 00:00:00 2001 From: Yavor16 Date: Tue, 7 Oct 2025 11:23:21 +0300 Subject: [PATCH 2/2] Add experimental to rollback feature --- commands/blue_green_deploy_command.go | 2 +- commands/deploy_command.go | 2 +- commands/rollback_mta command_test.go | 2 +- commands/rollback_mta_command.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commands/blue_green_deploy_command.go b/commands/blue_green_deploy_command.go index 9bcb7e5..1b2f902 100644 --- a/commands/blue_green_deploy_command.go +++ b/commands/blue_green_deploy_command.go @@ -64,7 +64,7 @@ func (c *BlueGreenDeployCommand) GetPluginCommand() plugin.Command { util.GetShortOption(uploadTimeoutOpt): "Upload app timeout in seconds", util.GetShortOption(taskExecutionTimeoutOpt): "Task execution timeout in seconds", util.CombineFullAndShortParameters(startTimeoutOpt, timeoutOpt): "Start app timeout in seconds", - util.GetShortOption(shouldBackupPreviousVersionOpt): "Backup previous version of applications, use new cli command \"rollback-mta\" to rollback to the previous version", + util.GetShortOption(shouldBackupPreviousVersionOpt): "(EXPERIMENTAL) Backup previous version of applications, use new cli command \"rollback-mta\" to rollback to the previous version", }, }, } diff --git a/commands/deploy_command.go b/commands/deploy_command.go index a2bccc4..ed9930c 100644 --- a/commands/deploy_command.go +++ b/commands/deploy_command.go @@ -145,7 +145,7 @@ func (c *DeployCommand) GetPluginCommand() plugin.Command { util.GetShortOption(uploadTimeoutOpt): "Upload app timeout in seconds", util.GetShortOption(taskExecutionTimeoutOpt): "Task execution timeout in seconds", util.CombineFullAndShortParameters(startTimeoutOpt, timeoutOpt): "Start app timeout in seconds", - util.GetShortOption(shouldBackupPreviousVersionOpt): "(STRATEGY: BLUE-GREEN, INCREMENTAL-BLUE-GREEN) Backup previous version of applications, use new cli command \"rollback-mta\" to rollback to the previous version", + util.GetShortOption(shouldBackupPreviousVersionOpt): "(EXPERIMENTAL) (STRATEGY: BLUE-GREEN, INCREMENTAL-BLUE-GREEN) Backup previous version of applications, use new cli command \"rollback-mta\" to rollback to the previous version", }, }, } diff --git a/commands/rollback_mta command_test.go b/commands/rollback_mta command_test.go index d3b4427..d971d6b 100644 --- a/commands/rollback_mta command_test.go +++ b/commands/rollback_mta command_test.go @@ -97,7 +97,7 @@ var _ = Describe("RollbackMtaCommand", func() { It("returns the correct plugin command", func() { pluginCmd := command.GetPluginCommand() Expect(pluginCmd.Name).To(Equal("rollback-mta")) - Expect(pluginCmd.HelpText).To(Equal("Rollback of a multi-target app works only if [--backup-previous-version] flag was used during blue-green deployment and backup applications exists in the space")) + Expect(pluginCmd.HelpText).To(Equal("(EXPERIMENTAL) Rollback of a multi-target app works only if [--backup-previous-version] flag was used during blue-green deployment and backup applications exists in the space")) }) }) diff --git a/commands/rollback_mta_command.go b/commands/rollback_mta_command.go index d7f657d..b16a531 100644 --- a/commands/rollback_mta_command.go +++ b/commands/rollback_mta_command.go @@ -33,7 +33,7 @@ func NewRollbackMtaCommand() *RollbackMtaCommand { func (c *RollbackMtaCommand) GetPluginCommand() plugin.Command { return plugin.Command{ Name: "rollback-mta", - HelpText: "Rollback of a multi-target app works only if [--backup-previous-version] flag was used during blue-green deployment and backup applications exists in the space", + HelpText: "(EXPERIMENTAL) Rollback of a multi-target app works only if [--backup-previous-version] flag was used during blue-green deployment and backup applications exists in the space", UsageDetails: plugin.Usage{ Usage: `Rollback of a multi-target app cf rollback-mta MTA_ID [-t TIMEOUT] [-f] [--retries RETRIES] [--namespace NAMESPACE] [--do-not-fail-on-missing-permissions] [--abort-on-error] [--apps-start-timeout TIMEOUT] [--apps-stage-timeout TIMEOUT] [--apps-upload-timeout TIMEOUT] [--apps-task-execution-timeout TIMEOUT]