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/10/03 21:43:44 UTC
[incubator-openwhisk-wskdeploy] branch master updated: Fix the
issue with wskdeploy report (#583)
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 77236cb Fix the issue with wskdeploy report (#583)
77236cb is described below
commit 77236cb4f29ba5958c9aa44a134868071896a40a
Author: Vincent <sh...@us.ibm.com>
AuthorDate: Tue Oct 3 17:43:43 2017 -0400
Fix the issue with wskdeploy report (#583)
Closes #582
---
cmd/report.go | 5 +++--
deployers/whiskclient.go | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cmd/report.go b/cmd/report.go
index 5604238..61fb534 100644
--- a/cmd/report.go
+++ b/cmd/report.go
@@ -27,6 +27,7 @@ import (
"github.com/spf13/cobra"
"path"
"sync"
+ "os"
)
var wskpropsPath string
@@ -60,7 +61,7 @@ located under current user home.`,
func init() {
RootCmd.AddCommand(reportCmd)
- reportCmd.Flags().StringVarP(&wskpropsPath, "wskproppath", "w", ".", "path to wsk property file, default is to ~/.wskprops")
+ reportCmd.Flags().StringVarP(&wskpropsPath, "wskproppath", "w", path.Join(os.Getenv("HOME"), ".wskprops"), "path to wsk property file, default is to ~/.wskprops")
// Here you will define your flags and configuration settings.
@@ -76,7 +77,7 @@ func init() {
var boldString = color.New(color.Bold).SprintFunc()
-func printDeploymentInfo(*whisk.Client) error {
+func printDeploymentInfo(client *whisk.Client) error {
//We currently list packages, actions, triggers, rules.
wg.Add(4)
diff --git a/deployers/whiskclient.go b/deployers/whiskclient.go
index f0d874b..702f8b9 100644
--- a/deployers/whiskclient.go
+++ b/deployers/whiskclient.go
@@ -68,7 +68,7 @@ var CreateNewClient = func (config_input *whisk.Config) (*whisk.Client, error) {
var netClient = &http.Client{
Timeout: time.Second * utils.DEFAULT_HTTP_TIMEOUT,
}
- return whisk.NewClient(netClient, clientConfig)
+ return whisk.NewClient(netClient, config_input)
}
// we are reading openwhisk credentials (apihost, namespace, and auth) in the following precedence order:
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].