[GitHub] mrutkows closed pull request #772: upgrading go client

[GitBox <gi...@apache.org>]

mrutkows closed pull request #772: upgrading go client
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/772
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index d6613b32..a7ba4c55 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 1cf6a596..ede3ba02 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 377c4250..f5429125 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 {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services