Skip to content

Commit 8b2f126

Browse files
Yavor16Yavor16
authored
Remove experimental words from help command (#244)
* Remove experimental words from help command and add experimental to rollback feature LMCROSSITXSADEPLOY-3276
1 parent 1f209f2 commit 8b2f126

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎commands/blue_green_deploy_command.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ func (c *BlueGreenDeployCommand) GetPluginCommand() plugin.Command {
4545
actionOpt: "Action to perform on active deploy operation (abort, retry, resume, monitor)",
4646
forceOpt: "Force deploy without confirmation for aborting conflicting processes",
4747
util.GetShortOption(noStartOpt): "Do not start apps",
48-
util.GetShortOption(namespaceOpt): "(EXPERIMENTAL) Namespace for the MTA, applied on app names, app routes and service names",
49-
util.GetShortOption(applyNamespaceAppNamesOpt): "(EXPERIMENTAL) Apply namespace to application names: (true, false)",
50-
util.GetShortOption(applyNamespaceServiceNamesOpt): "(EXPERIMENTAL) Apply namespace to service names: (true, false)",
51-
util.GetShortOption(applyNamespaceAppRoutesOpt): "(EXPERIMENTAL) Apply namespace to application routes: (true, false)",
52-
util.GetShortOption(applyNamespaceAsSuffix): "(EXPERIMENTAL) Apply namespace as a suffix rather than a prefix: (true, false)",
48+
util.GetShortOption(namespaceOpt): "Namespace for the MTA, applied on app names, app routes and service names",
49+
util.GetShortOption(applyNamespaceAppNamesOpt): "Apply namespace to application names: (true, false)",
50+
util.GetShortOption(applyNamespaceServiceNamesOpt): "Apply namespace to service names: (true, false)",
51+
util.GetShortOption(applyNamespaceAppRoutesOpt): "Apply namespace to application routes: (true, false)",
52+
util.GetShortOption(applyNamespaceAsSuffix): "Apply namespace as a suffix rather than a prefix: (true, false)",
5353
util.GetShortOption(deleteServicesOpt): "Recreate changed services / delete discontinued services",
5454
util.GetShortOption(deleteServiceKeysOpt): "Delete existing service keys and apply the new ones",
5555
util.GetShortOption(deleteServiceBrokersOpt): "Delete discontinued service brokers",

‎commands/deploy_command.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func (c *DeployCommand) GetPluginCommand() plugin.Command {
110110
Perform action on an active deploy operation
111111
cf deploy -i OPERATION_ID -a ACTION [-u URL]
112112
113-
(EXPERIMENTAL) Deploy a multi-target app archive referenced by a remote URL
113+
Deploy a multi-target app archive referenced by a remote URL
114114
<write MTA archive URL to STDOUT> | 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,
115115

116116
Options: map[string]string{
@@ -123,11 +123,11 @@ func (c *DeployCommand) GetPluginCommand() plugin.Command {
123123
moduleOpt: "Deploy list of modules which are contained in the deployment descriptor, in the current location",
124124
resourceOpt: "Deploy list of resources which are contained in the deployment descriptor, in the current location",
125125
util.GetShortOption(noStartOpt): "Do not start apps",
126-
util.GetShortOption(namespaceOpt): "(EXPERIMENTAL) Namespace for the MTA, applied on app names, app routes and service names",
127-
util.GetShortOption(applyNamespaceAppNamesOpt): "(EXPERIMENTAL) Apply namespace to application names: (true, false)",
128-
util.GetShortOption(applyNamespaceServiceNamesOpt): "(EXPERIMENTAL) Apply namespace to service names: (true, false)",
129-
util.GetShortOption(applyNamespaceAppRoutesOpt): "(EXPERIMENTAL) Apply namespace to application routes: (true, false)",
130-
util.GetShortOption(applyNamespaceAsSuffix): "(EXPERIMENTAL) Apply namespace as a suffix rather than a prefix: (true, false)",
126+
util.GetShortOption(namespaceOpt): "Namespace for the MTA, applied on app names, app routes and service names",
127+
util.GetShortOption(applyNamespaceAppNamesOpt): "Apply namespace to application names: (true, false)",
128+
util.GetShortOption(applyNamespaceServiceNamesOpt): "Apply namespace to service names: (true, false)",
129+
util.GetShortOption(applyNamespaceAppRoutesOpt): "Apply namespace to application routes: (true, false)",
130+
util.GetShortOption(applyNamespaceAsSuffix): "Apply namespace as a suffix rather than a prefix: (true, false)",
131131
util.GetShortOption(deleteServicesOpt): "Recreate changed services / delete discontinued services",
132132
util.GetShortOption(deleteServiceKeysOpt): "Delete existing service keys and apply the new ones",
133133
util.GetShortOption(deleteServiceBrokersOpt): "Delete discontinued service brokers",
@@ -138,14 +138,14 @@ func (c *DeployCommand) GetPluginCommand() plugin.Command {
138138
util.GetShortOption(allModulesOpt): "Deploy all modules which are contained in the deployment descriptor, in the current location",
139139
util.GetShortOption(allResourcesOpt): "Deploy all resources which are contained in the deployment descriptor, in the current location",
140140
util.GetShortOption(retriesOpt): "Retry the operation N times in case a non-content error occurs (default 3)",
141-
util.GetShortOption(strategyOpt): "Specify the deployment strategy when updating an mta (default, blue-green, (EXPERIMENTAL) incremental-blue-green)",
142-
util.GetShortOption(skipTestingPhase): "(STRATEGY: BLUE-GREEN, (EXPERIMENTAL) INCREMENTAL-BLUE-GREEN) Do not require confirmation for deleting the previously deployed MTA app",
143-
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",
141+
util.GetShortOption(strategyOpt): "Specify the deployment strategy when updating an mta (default, blue-green, incremental-blue-green)",
142+
util.GetShortOption(skipTestingPhase): "(STRATEGY: BLUE-GREEN, INCREMENTAL-BLUE-GREEN) Do not require confirmation for deleting the previously deployed MTA app",
143+
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",
144144
util.GetShortOption(stageTimeoutOpt): "Stage app timeout in seconds",
145145
util.GetShortOption(uploadTimeoutOpt): "Upload app timeout in seconds",
146146
util.GetShortOption(taskExecutionTimeoutOpt): "Task execution timeout in seconds",
147147
util.CombineFullAndShortParameters(startTimeoutOpt, timeoutOpt): "Start app timeout in seconds",
148-
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",
148+
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",
149149
},
150150
},
151151
}

‎commands/mta_command.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (c *MtaCommand) GetPluginCommand() plugin.Command {
4545
UsageDetails: plugin.Usage{
4646
Usage: "cf mta MTA_ID [--namespace NAMESPACE] [-u URL]" + util.BaseEnvHelpText,
4747
Options: map[string]string{
48-
util.GetShortOption(namespaceOpt): "(EXPERIMENTAL) namespace of the requested mta, empty by default",
48+
util.GetShortOption(namespaceOpt): "namespace of the requested mta, empty by default",
4949
deployServiceURLOpt: "Deploy service URL, by default 'deploy-service.<system-domain>'",
5050
},
5151
},

‎commands/rollback_mta command_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ var _ = Describe("RollbackMtaCommand", func() {
9797
It("returns the correct plugin command", func() {
9898
pluginCmd := command.GetPluginCommand()
9999
Expect(pluginCmd.Name).To(Equal("rollback-mta"))
100-
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"))
100+
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"))
101101
})
102102
})
103103

‎commands/rollback_mta_command.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func NewRollbackMtaCommand() *RollbackMtaCommand {
3333
func (c *RollbackMtaCommand) GetPluginCommand() plugin.Command {
3434
return plugin.Command{
3535
Name: "rollback-mta",
36-
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",
36+
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",
3737
UsageDetails: plugin.Usage{
3838
Usage: `Rollback of a multi-target app
3939
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]
@@ -45,7 +45,7 @@ func (c *RollbackMtaCommand) GetPluginCommand() plugin.Command {
4545
operationIDOpt: "Active deploy operation ID",
4646
actionOpt: "Action to perform on active deploy operation (abort, retry, resume, monitor)",
4747
forceOpt: "Force deploy without confirmation for aborting conflicting processes",
48-
util.GetShortOption(namespaceOpt): "(EXPERIMENTAL) Namespace for the MTA, applied on app names, app routes and service names",
48+
util.GetShortOption(namespaceOpt): "Namespace for the MTA, applied on app names, app routes and service names",
4949
util.GetShortOption(deleteServicesOpt): "Recreate changed services / delete discontinued services",
5050
util.GetShortOption(noFailOnMissingPermissionsOpt): "Do not fail on missing permissions for admin operations",
5151
util.GetShortOption(abortOnErrorOpt): "Auto-abort the process on any errors",

‎commands/undeploy_command.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (c *UndeployCommand) GetPluginCommand() plugin.Command {
5151
util.GetShortOption(noFailOnMissingPermissionsOpt): "Do not fail on missing permissions for admin operations",
5252
util.GetShortOption(abortOnErrorOpt): "Auto-abort the process on any errors",
5353
util.GetShortOption(retriesOpt): "Retry the operation N times in case a non-content error occurs (default 3)",
54-
util.GetShortOption(namespaceOpt): "(EXPERIMENTAL) Specify the (optional) namespace the target mta is in",
54+
util.GetShortOption(namespaceOpt): "Specify the (optional) namespace the target mta is in",
5555
},
5656
},
5757
}

0 commit comments

Comments
 (0)