Merge pull request #588 from pishro-cc/master

better error reporting with feeded curl data is not enclosed.
cloudfoundry · Sep 28, 2015 · 4d5fe31 · 4d5fe31
2 parents 584aeac + 12178c7
commit 4d5fe31
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 2 deletions.
diff --git a/cf/commands/curl.go b/cf/commands/curl.go
@@ -49,7 +49,7 @@ func (cmd *Curl) MetaData() command_registry.CommandMetadata {
 
 func (cmd *Curl) Requirements(requirementsFactory requirements.Factory, fc flags.FlagContext) (reqs []requirements.Requirement, err error) {
 	if len(fc.Args()) != 1 {
-		cmd.ui.Failed(T("Incorrect Usage. Requires an argument\n\n") + command_registry.Commands.CommandUsage("curl"))
+		cmd.ui.Failed(T("Incorrect Usage. An argument is missing or not correctly enclosed.\n\n") + command_registry.Commands.CommandUsage("curl"))
 	}
 
 	reqs = []requirements.Requirement{

diff --git a/cf/commands/curl_test.go b/cf/commands/curl_test.go
@@ -61,7 +61,7 @@ var _ = Describe("curl command", func() {
 		It("fails with usage when not given enough input", func() {
 			runCurlWithInputs([]string{})
 			Expect(ui.Outputs).To(ContainSubstrings(
-				[]string{"Incorrect Usage", "Requires an argument"},
+				[]string{"Incorrect Usage", "An argument is missing or not correctly enclosed"},
 			))
 		})
 

diff --git a/cf/i18n/resources/de_DE.all.json b/cf/i18n/resources/de_DE.all.json
@@ -2764,6 +2764,11 @@
       "translation": "Incorrect Usage. Requires an argument\n\n",
       "modified": false
    },
+   {
+      "id": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "translation": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "modified": false
+   },
    {
       "id": "Incorrect Usage. Requires app name as argument\n\n",
       "translation": "Incorrect Usage. Requires app name as argument\n\n",

diff --git a/cf/i18n/resources/en_US.all.json b/cf/i18n/resources/en_US.all.json
@@ -2764,6 +2764,11 @@
       "translation": "Incorrect Usage. Requires an argument\n\n",
       "modified": false
    },
+   {
+      "id": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "translation": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "modified": false
+   },
    {
       "id": "Incorrect Usage. Requires app name as argument\n\n",
       "translation": "Incorrect Usage. Requires app name as argument\n\n",

diff --git a/cf/i18n/resources/es_ES.all.json b/cf/i18n/resources/es_ES.all.json
@@ -2779,6 +2779,11 @@
       "translation": "Incorrect Usage. Requires arguments\n\n",
       "modified": false
    },
+   {
+      "id": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "translation": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "modified": false
+   },
    {
       "id": "Incorrect Usage. Requires buildpack_name, path and position as arguments\n\n",
       "translation": "Incorrect Usage. Requires buildpack_name, path and position as arguments\n\n",

diff --git a/cf/i18n/resources/fr_FR.all.json b/cf/i18n/resources/fr_FR.all.json
@@ -2764,6 +2764,11 @@
       "translation": "Incorrect Usage. Requires an argument\n\n",
       "modified": false
    },
+   {
+      "id": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "translation": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "modified": false
+   },
    {
       "id": "Incorrect Usage. Requires app name as argument\n\n",
       "translation": "Incorrect Usage. Requires app name as argument\n\n",

diff --git a/cf/i18n/resources/it_IT.all.json b/cf/i18n/resources/it_IT.all.json
@@ -2764,6 +2764,11 @@
       "translation": "Incorrect Usage. Requires an argument\n\n",
       "modified": false
    },
+   {
+      "id": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "translation": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "modified": false
+   },
    {
       "id": "Incorrect Usage. Requires app name as argument\n\n",
       "translation": "Incorrect Usage. Requires app name as argument\n\n",

diff --git a/cf/i18n/resources/ja_JA.all.json b/cf/i18n/resources/ja_JA.all.json
@@ -2764,6 +2764,11 @@
       "translation": "Incorrect Usage. Requires an argument\n\n",
       "modified": false
    },
+   {
+      "id": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "translation": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "modified": false
+   },
    {
       "id": "Incorrect Usage. Requires app name as argument\n\n",
       "translation": "Incorrect Usage. Requires app name as argument\n\n",

diff --git a/cf/i18n/resources/pt_BR.all.json b/cf/i18n/resources/pt_BR.all.json
@@ -2764,6 +2764,11 @@
       "translation": "Incorrect Usage. Requires an argument\n\n",
       "modified": false
    },
+   {
+      "id": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "translation": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "modified": false
+   },
    {
       "id": "Incorrect Usage. Requires app name as argument\n\n",
       "translation": "Incorrect Usage. Requires app name as argument\n\n",

diff --git a/cf/i18n/resources/zh_Hans.all.json b/cf/i18n/resources/zh_Hans.all.json
@@ -2764,6 +2764,11 @@
       "translation": "Incorrect Usage. Requires an argument\n\n",
       "modified": false
    },
+   {
+      "id": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "translation": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "modified": false
+   },
    {
       "id": "Incorrect Usage. Requires app name as argument\n\n",
       "translation": "Incorrect Usage. Requires app name as argument\n\n",

diff --git a/cf/i18n/resources/zh_Hant.all.json b/cf/i18n/resources/zh_Hant.all.json
@@ -2764,6 +2764,11 @@
       "translation": "Incorrect Usage. Requires an argument\n\n",
       "modified": false
    },
+   {
+      "id": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "translation": "Incorrect Usage. An argument is missing or not correctly enclosed.\n\n",
+      "modified": false
+   },
    {
       "id": "Incorrect Usage. Requires app name as argument\n\n",
       "translation": "Incorrect Usage. Requires app name as argument\n\n",