[incubator-openwhisk-wskdeploy] branch master updated: upgrading go client (#772)

[mr...@apache.org]

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 cc0394c  upgrading go client (#772)
cc0394c is described below

commit cc0394cc12e53a4688e6ccf67d63c9de9c5e6d5e
Author: Priti Desai <pd...@us.ibm.com>
AuthorDate: Tue Mar 6 19:37:23 2018 -0800

    upgrading go client (#772)
---
 Godeps/Godeps.json           | 4 ++--
 cmd/export.go                | 8 +++++---
 deployers/servicedeployer.go | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index d6613b3..a7ba4c5 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -105,11 +105,11 @@
 		},
 		{
 			"ImportPath": "github.com/apache/incubator-openwhisk-client-go/whisk",
-			"Rev": "a81a9be21faae877e858c6ab9122a40419577f95"
+			"Rev": "717bc3a1638460e069e411e9a8bf0ea5c97f1efa"
 		},
 		{
 			"ImportPath": "github.com/apache/incubator-openwhisk-client-go/wski18n",
-			"Rev": "a81a9be21faae877e858c6ab9122a40419577f95"
+			"Rev": "717bc3a1638460e069e411e9a8bf0ea5c97f1efa"
 		},
 		{
 			"ImportPath": "github.com/pelletier/go-buffruneio",
diff --git a/cmd/export.go b/cmd/export.go
index 1cf6a59..ede3ba0 100644
--- a/cmd/export.go
+++ b/cmd/export.go
@@ -61,7 +61,7 @@ func ExportAction(actionName string, packageName string, maniyaml *parsers.YAML)
 		maniyaml.Packages[packageName] = pkg
 	}
 
-	wskAction, _, err := client.Actions.Get(actionName)
+	wskAction, _, err := client.Actions.Get(actionName, true)
 	if err != nil {
 		return err
 	}
@@ -112,8 +112,10 @@ func ExportAction(actionName string, packageName string, maniyaml *parsers.YAML)
 		defer f.Close()
 
 		// store action function in the filesystem next to the manifest.yml
-		// TODO: consider to name files by namespace + action to make function file names uniqueue
-		f.Write([]byte(*wskAction.Exec.Code))
+		// TODO: consider to name files by namespace + action to make function file names unique
+		if wskAction.Exec.Code != nil {
+			f.Write([]byte(*wskAction.Exec.Code))
+		}
 		pkg.Actions[wskAction.Name] = parsedAction
 	}
 
diff --git a/deployers/servicedeployer.go b/deployers/servicedeployer.go
index 377c425..f542912 100644
--- a/deployers/servicedeployer.go
+++ b/deployers/servicedeployer.go
@@ -1331,7 +1331,7 @@ func (deployer *ServiceDeployer) deleteAction(pkgname string, action *whisk.Acti
 
 	displayPreprocessingInfo(parsers.YAML_KEY_ACTION, action.Name, false)
 
-	if _, _, ok := deployer.Client.Actions.Get(action.Name); ok == nil {
+	if _, _, ok := deployer.Client.Actions.Get(action.Name, false); ok == nil {
 		var err error
 		var response *http.Response
 		err = retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {

-- 
To stop receiving notification emails like this one, please contact
mrutkowski@apache.org.