You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by mr...@apache.org on 2017/09/05 22:56:35 UTC
[incubator-openwhisk-wskdeploy] branch master updated: Pop up all
the errors in deploy (#445)
This is an automated email from the ASF dual-hosted git repository.
mrutkowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git
The following commit(s) were added to refs/heads/master by this push:
new cc7fe16 Pop up all the errors in deploy (#445)
cc7fe16 is described below
commit cc7fe16cb13aba6e481bb5c2782b10dd0f7537a0
Author: Vincent <sh...@us.ibm.com>
AuthorDate: Tue Sep 5 18:56:33 2017 -0400
Pop up all the errors in deploy (#445)
---
deployers/servicedeployer.go | 21 +++++++++++++++------
utils/errorhandlers.go | 6 +++---
wski18n/i18n_resources.go | 4 ++--
wski18n/resources/en_US.all.json | 9 ++++++++-
4 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/deployers/servicedeployer.go b/deployers/servicedeployer.go
index 8a6cba7..4e58c50 100644
--- a/deployers/servicedeployer.go
+++ b/deployers/servicedeployer.go
@@ -24,6 +24,7 @@ import (
"path"
"strings"
"sync"
+ "strconv"
"github.com/apache/incubator-openwhisk-client-go/whisk"
"github.com/apache/incubator-openwhisk-wskdeploy/parsers"
@@ -205,8 +206,8 @@ func (deployer *ServiceDeployer) Deploy() error {
return err
}
- fmt.Println("\nDeployment completed successfully.")
- return nil
+ utils.PrintOpenWhiskOutput(wski18n.T("Deployment completed successfully.\n"))
+ return nil
} else {
deployer.InteractiveChoice = false
@@ -222,7 +223,7 @@ func (deployer *ServiceDeployer) Deploy() error {
return err
}
- fmt.Println("\nDeployment completed successfully.")
+ utils.PrintOpenWhiskOutput(wski18n.T("Deployment completed successfully.\n"))
return nil
}
@@ -303,8 +304,12 @@ func (deployer *ServiceDeployer) DeployDependencies() error {
}
func (deployer *ServiceDeployer) DeployPackages() error {
+ var err error
for _, pack := range deployer.Deployment.Packages {
- deployer.createPackage(pack.Package)
+ err = deployer.createPackage(pack.Package)
+ if err != nil {
+ return err
+ }
}
return nil
}
@@ -375,14 +380,18 @@ func (deployer *ServiceDeployer) createBinding(packa *whisk.BindingPackage) {
fmt.Println("Done!")
}
-func (deployer *ServiceDeployer) createPackage(packa *whisk.Package) {
+func (deployer *ServiceDeployer) createPackage(packa *whisk.Package) error {
fmt.Print("Deploying package " + packa.Name + " ... ")
_, _, err := deployer.Client.Packages.Insert(packa, true)
if err != nil {
wskErr := err.(*whisk.WskError)
- fmt.Printf("Got error creating package with error message: %v and error code: %v.\n", wskErr.Error(), wskErr.ExitCode)
+ errString := wski18n.T("Got error creating package with error message: {{.err}} and error code: {{.code}}.\n",
+ map[string]interface{}{"err": wskErr.Error(), "code": strconv.Itoa(wskErr.ExitCode)})
+ whisk.Debug(whisk.DbgError, errString)
+ return wskErr
}
fmt.Println("Done!")
+ return nil
}
func (deployer *ServiceDeployer) createTrigger(trigger *whisk.Trigger) {
diff --git a/utils/errorhandlers.go b/utils/errorhandlers.go
index cf81836..db53d88 100644
--- a/utils/errorhandlers.go
+++ b/utils/errorhandlers.go
@@ -52,7 +52,7 @@ func PrintOpenWhiskError(err error) {
fmt.Fprintf(outputStream, "%s%s\n", color.RedString(wski18n.T("Error: ")), err.Error())
}
-func PrintOpenWhiskOutput(err error) {
- outputStream := colorable.NewColorableStderr()
- fmt.Fprintf(outputStream, "%s%s\n", color.RedString(wski18n.T("Error: ")), err.Error())
+func PrintOpenWhiskOutput(output string) {
+ outputStream := colorable.NewColorableStdout()
+ fmt.Fprintf(outputStream, "%s", color.GreenString(output))
}
diff --git a/wski18n/i18n_resources.go b/wski18n/i18n_resources.go
index ec202e8..05a77c6 100644
--- a/wski18n/i18n_resources.go
+++ b/wski18n/i18n_resources.go
@@ -114,7 +114,7 @@ func wski18nResourcesDe_deAllJson() (*asset, error) {
return a, nil
}
-var _wski18nResourcesEn_usAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x95\xc1\x8e\xd3\x30\x10\x40\xef\xf9\x8a\x51\x2f\x7b\x59\x85\xfb\xde\xf6\xb0\x68\x57\x08\xba\xa2\x0b\x08\x01\x52\x4d\x32\x69\x4c\xed\x71\x64\x8f\x8b\x4a\x94\x7f\x47\x76\xda\x52\x15\x27\x4d\x0b\xb7\xc4\x99\x79\xf3\xec\xb1\x9d\x2f\x19\x40\x9b\x01\x00\xcc\x64\x39\xbb\x83\xd9\x23\x2a\x65\x66\xb7\xfd\x10\x5b\x41\x4e\x09\x96\x86\xc2\xb7\x7b\x82\xfb\xe7\x27\xa8\x8d\x63\xd0\xde\x31\x7c\x47\x68\xac\xd9\xc8\x12 [...]
+var _wski18nResourcesEn_usAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x95\xdf\x6f\xd3\x30\x10\xc7\xdf\xf3\x57\x9c\xfa\xb2\x97\xa9\xbc\xef\x6d\x12\x83\x4d\x08\x36\xb1\x01\x42\x80\x54\x63\x5f\x1a\x53\xff\x92\x7d\xee\x54\xa2\xfc\xef\xc8\x49\x1b\xaa\xe2\xa4\x69\x81\x37\xc7\xbe\xfb\x7c\xbf\xf6\xd9\x97\x2f\x05\x40\x5d\x00\x00\xcc\xa4\x98\x5d\xc1\xec\x16\x95\xb2\xb3\xcb\x6e\x8a\x3c\x33\x41\x31\x92\xd6\xa4\xb5\x6b\x03\xd7\x0f\x77\x50\xd9\x40\xa0\x63\x20\xf8\x8e\xe0\xbc\x5d\x4b [...]
func wski18nResourcesEn_usAllJsonBytes() ([]byte, error) {
return bindataRead(
@@ -129,7 +129,7 @@ func wski18nResourcesEn_usAllJson() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "wski18n/resources/en_US.all.json", size: 2359, mode: os.FileMode(420), modTime: time.Unix(1504640900, 0)}
+ info := bindataFileInfo{name: "wski18n/resources/en_US.all.json", size: 2688, mode: os.FileMode(420), modTime: time.Unix(1504645143, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
diff --git a/wski18n/resources/en_US.all.json b/wski18n/resources/en_US.all.json
index c218af0..a372cf4 100644
--- a/wski18n/resources/en_US.all.json
+++ b/wski18n/resources/en_US.all.json
@@ -81,6 +81,13 @@
{
"id": "Unmarshal Openwhisk info from internet.\n",
"translation": "Unmarshal Openwhisk info from internet.\n"
+ },
+ {
+ "id": "Deployment completed successfully.\n",
+ "translation": "Deployment completed successfully.\n"
+ },
+ {
+ "id": "Got error creating package with error message: {{.err}} and error code: {{.code}}.\n",
+ "translation": "Got error creating package with error message: {{.err}} and error code: {{.code}}.\n"
}
-
]
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].