diff --git a/command/v7/labels_command.go b/command/v7/labels_command.go index 4adc2543a80..284b21c05f0 100644 --- a/command/v7/labels_command.go +++ b/command/v7/labels_command.go @@ -32,7 +32,7 @@ type LabelsCommand struct { RequiredArgs flag.LabelsArgs `positional-args:"yes"` BuildpackStack string `long:"stack" short:"s" description:"Specify stack to disambiguate buildpacks with the same name"` - usage interface{} `usage:"CF_NAME labels RESOURCE RESOURCE_NAME\n\nEXAMPLES:\n cf labels app dora\n cf labels org business\n cf labels buildpack go_buildpack --stack cflinuxfs3 \n\nRESOURCES:\n app\n buildpack\n domain\n org\n route\n service-broker\n service-offering\n service-plan\n space\n stack"` + usage interface{} `usage:"CF_NAME labels RESOURCE RESOURCE_NAME\n\nEXAMPLES:\n cf labels app dora\n cf labels org business\n cf labels buildpack go_buildpack --stack cflinuxfs4 \n\nRESOURCES:\n app\n buildpack\n domain\n org\n route\n service-broker\n service-offering\n service-plan\n space\n stack"` relatedCommands interface{} `related_commands:"set-label, unset-label"` ServiceBroker string `long:"broker" short:"b" description:"Specify a service broker to disambiguate service offerings or service plans with the same name."` ServiceOffering string `long:"offering" short:"e" description:"Specify a service offering to disambiguate service plans with the same name."` diff --git a/command/v7/set_label_command.go b/command/v7/set_label_command.go index f36984fdb0f..abce36c14d4 100644 --- a/command/v7/set_label_command.go +++ b/command/v7/set_label_command.go @@ -19,7 +19,7 @@ type SetLabelCommand struct { BaseCommand RequiredArgs flag.SetLabelArgs `positional-args:"yes"` - usage interface{} `usage:"CF_NAME set-label RESOURCE RESOURCE_NAME KEY=VALUE...\n\nEXAMPLES:\n cf set-label app dora env=production\n cf set-label org business pci=true public-facing=false\n cf set-label buildpack go_buildpack go=1.12 -s cflinuxfs3\n\nRESOURCES:\n app\n buildpack\n domain\n org\n route\n service-broker\n service-offering\n service-plan\n space\n stack"` + usage interface{} `usage:"CF_NAME set-label RESOURCE RESOURCE_NAME KEY=VALUE...\n\nEXAMPLES:\n cf set-label app dora env=production\n cf set-label org business pci=true public-facing=false\n cf set-label buildpack go_buildpack go=1.12 -s cflinuxfs4\n\nRESOURCES:\n app\n buildpack\n domain\n org\n route\n service-broker\n service-offering\n service-plan\n space\n stack"` relatedCommands interface{} `related_commands:"labels, unset-label"` BuildpackStack string `long:"stack" short:"s" description:"Specify stack to disambiguate buildpacks with the same name"` ServiceBroker string `long:"broker" short:"b" description:"Specify a service broker to disambiguate service offerings or service plans with the same name."` diff --git a/command/v7/unset_label_command.go b/command/v7/unset_label_command.go index b58920c3ed3..029d8a4a716 100644 --- a/command/v7/unset_label_command.go +++ b/command/v7/unset_label_command.go @@ -16,7 +16,7 @@ type UnsetLabelCommand struct { BaseCommand RequiredArgs flag.UnsetLabelArgs `positional-args:"yes"` - usage interface{} `usage:"CF_NAME unset-label RESOURCE RESOURCE_NAME KEY...\n\nEXAMPLES:\n cf unset-label app dora ci_signature_sha2\n cf unset-label org business pci public-facing\n cf unset-label buildpack go_buildpack go -s cflinuxfs3\n\nRESOURCES:\n app\n buildpack\n domain\n org\n route\n service-broker\n service-offering\n service-plan\n space\n stack"` + usage interface{} `usage:"CF_NAME unset-label RESOURCE RESOURCE_NAME KEY...\n\nEXAMPLES:\n cf unset-label app dora ci_signature_sha2\n cf unset-label org business pci public-facing\n cf unset-label buildpack go_buildpack go -s cflinuxfs4\n\nRESOURCES:\n app\n buildpack\n domain\n org\n route\n service-broker\n service-offering\n service-plan\n space\n stack"` relatedCommands interface{} `related_commands:"labels, set-label"` BuildpackStack string `long:"stack" short:"s" description:"Specify stack to disambiguate buildpacks with the same name"` ServiceBroker string `long:"broker" short:"b" description:"Specify a service broker to disambiguate service offerings or service plans with the same name."` diff --git a/integration/v6/experimental/v3_zdt_push_command_test.go b/integration/v6/experimental/v3_zdt_push_command_test.go index bc31cc354a7..569dfd85b5f 100644 --- a/integration/v6/experimental/v3_zdt_push_command_test.go +++ b/integration/v6/experimental/v3_zdt_push_command_test.go @@ -509,13 +509,13 @@ var _ = Describe("v3-zdt-push command", func() { It("uses the specified stack", func() { var session *Session helpers.WithHelloWorldApp(func(appDir string) { - session = helpers.CustomCF(helpers.CFEnv{WorkingDirectory: appDir}, "v3-zdt-push", appName, "-s", "cflinuxfs3") + session = helpers.CustomCF(helpers.CFEnv{WorkingDirectory: appDir}, "v3-zdt-push", appName, "-s", "cflinuxfs4") Eventually(session).Should(Exit(0)) }) Eventually(session).Should(Say(`name:\s+%s`, appName)) Eventually(session).Should(Say(`requested state:\s+started`)) Eventually(session).Should(Say(`routes:\s+%s\.%s`, appName, domainName)) - Eventually(session).Should(Say(`stack:\s+cflinuxfs3`)) + Eventually(session).Should(Say(`stack:\s+cflinuxfs4`)) }) }) @@ -533,7 +533,7 @@ var _ = Describe("v3-zdt-push command", func() { It("creates the app with the specified stack and buildpack", func() { var session *Session helpers.WithHelloWorldApp(func(appDir string) { - session = helpers.CustomCF(helpers.CFEnv{WorkingDirectory: appDir}, "v3-zdt-push", appName, "-b", "https://github.com/cloudfoundry/staticfile-buildpack", "-s", "cflinuxfs3") + session = helpers.CustomCF(helpers.CFEnv{WorkingDirectory: appDir}, "v3-zdt-push", appName, "-b", "https://github.com/cloudfoundry/staticfile-buildpack", "-s", "cflinuxfs4") Eventually(session).Should(Exit(0)) }) // TODO: assert specific error text when it is written