This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git
commit 172e3189d4aa9c96357ead49a5ecee0f5dee6d94 Author: Vincent Hou <[email protected]> AuthorDate: Thu Aug 17 10:52:12 2017 -0400 Pin the client go version to b239221db78b0578518daa81d97ab66cad6d08db --- Godeps/Godeps.json | 2 +- commands/action.go | 4 ++-- commands/api.go | 2 +- commands/namespace.go | 4 ++-- commands/package.go | 3 +-- commands/qualified_name.go | 4 ++-- commands/rule.go | 2 +- commands/trigger.go | 2 +- commands/wsk.go | 2 +- 9 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 88d9a94..f8f6eaf 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -65,7 +65,7 @@ }, { "ImportPath": "github.com/apache/incubator-openwhisk-client-go/...", - "Rev": "b5eb4181f14d888a812fdf604d86092c6ceb10eb" + "Rev": "b239221db78b0578518daa81d97ab66cad6d08db" } ] } diff --git a/commands/action.go b/commands/action.go index f14cc9a..1546602 100644 --- a/commands/action.go +++ b/commands/action.go @@ -235,7 +235,7 @@ var actionGetCmd = &cobra.Command{ Properties.APIVersion, qualifiedName.GetPackageName()) printActionGetWithURL(qualifiedName.GetEntity(), actionURL) - } else if flags.common.summary { + } else if Flags.common.summary { printSummary(action) } else { if len(field) > 0 { @@ -321,7 +321,7 @@ var actionListCmd = &cobra.Command{ return actionListError(qualifiedName.GetEntityName(), options, err) } - sortByName := flags.common.nameSort + sortByName := Flags.common.nameSort printList(actions, sortByName) return nil diff --git a/commands/api.go b/commands/api.go index 0f7f01c..fda962e 100644 --- a/commands/api.go +++ b/commands/api.go @@ -520,7 +520,7 @@ var apiListCmd = &cobra.Command{ retApiArray = (*whisk.RetApiArray)(retApi) } //Checks for any order flags being passed - sortByName := flags.common.nameSort + sortByName := Flags.common.nameSort // Display the APIs - applying any specified filtering if (Flags.common.full) { fmt.Fprintf(color.Output, diff --git a/commands/namespace.go b/commands/namespace.go index f7af0fc..688cb2e 100644 --- a/commands/namespace.go +++ b/commands/namespace.go @@ -99,7 +99,7 @@ var namespaceGetCmd = &cobra.Command{ fmt.Fprintf(color.Output, wski18n.T("Entities in namespace: {{.namespace}}\n", map[string]interface{}{"namespace": boldString(getClientNamespace())})) - sortByName := flags.common.nameSort + sortByName := Flags.common.nameSort printList(namespace.Contents.Packages, sortByName) printList(namespace.Contents.Actions, sortByName) printList(namespace.Contents.Triggers, sortByName) @@ -122,7 +122,7 @@ var namespaceGetCmd = &cobra.Command{ } func init() { - namespaceGetCmd.Flags().BoolVarP(&flags.common.nameSort, "name-sort", "n", false, wski18n.T("sorts a list alphabetically by entity name; only applicable within the limit/skip returned entity block")) + namespaceGetCmd.Flags().BoolVarP(&Flags.common.nameSort, "name-sort", "n", false, wski18n.T("sorts a list alphabetically by entity name; only applicable within the limit/skip returned entity block")) namespaceCmd.AddCommand( namespaceListCmd, diff --git a/commands/package.go b/commands/package.go index 9dff500..45a6d1f 100644 --- a/commands/package.go +++ b/commands/package.go @@ -412,7 +412,7 @@ var packageListCmd = &cobra.Command{ return werr } - sortByName := flags.common.nameSort + sortByName := Flags.common.nameSort printList(packages, sortByName) return nil @@ -504,7 +504,6 @@ var packageRefreshCmd = &cobra.Command{ } func init() { -<<<<<<< HEAD packageCreateCmd.Flags().StringSliceVarP(&Flags.common.annotation, "annotation", "a", []string{}, wski18n.T("annotation values in `KEY VALUE` format")) packageCreateCmd.Flags().StringVarP(&Flags.common.annotFile, "annotation-file", "A", "", wski18n.T("`FILE` containing annotation values in JSON format")) packageCreateCmd.Flags().StringSliceVarP(&Flags.common.param, "param", "p", []string{}, wski18n.T("parameter values in `KEY VALUE` format")) diff --git a/commands/qualified_name.go b/commands/qualified_name.go index 61512f6..e94aa9a 100644 --- a/commands/qualified_name.go +++ b/commands/qualified_name.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" "strings" - "../../go-whisk/whisk" - "../wski18n" + "github.com/apache/incubator-openwhisk-client-go/whisk" + "github.com/apache/incubator-openwhisk-cli/wski18n" ) type QualifiedName struct { diff --git a/commands/rule.go b/commands/rule.go index 67cddf0..f88a2dd 100644 --- a/commands/rule.go +++ b/commands/rule.go @@ -403,7 +403,7 @@ var ruleListCmd = &cobra.Command{ } } - sortByName := flags.common.nameSort + sortByName := Flags.common.nameSort printList(rules, sortByName) return nil }, diff --git a/commands/trigger.go b/commands/trigger.go index 0d85af7..92ae09c 100644 --- a/commands/trigger.go +++ b/commands/trigger.go @@ -457,7 +457,7 @@ var triggerListCmd = &cobra.Command{ werr := whisk.MakeWskErrorFromWskError(errors.New(errStr), err, whisk.EXIT_CODE_ERR_GENERAL, whisk.DISPLAY_MSG, whisk.NO_DISPLAY_USAGE) return werr } - sortByName := flags.common.nameSort + sortByName := Flags.common.nameSort printList(triggers, sortByName) return nil }, diff --git a/commands/wsk.go b/commands/wsk.go index 874e549..b95a898 100644 --- a/commands/wsk.go +++ b/commands/wsk.go @@ -44,7 +44,7 @@ func init() { WskCmd.SetHelpTemplate(`{{with or .Long .Short }}{{.}} {{end}}{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`) -listCmd.Flags().BoolVarP(&flags.common.nameSort, "name-sort", "n", false, wski18n.T("sorts a list alphabetically by entity name; only applicable within the limit/skip returned entity block")) +listCmd.Flags().BoolVarP(&Flags.common.nameSort, "name-sort", "n", false, wski18n.T("sorts a list alphabetically by entity name; only applicable within the limit/skip returned entity block")) WskCmd.AddCommand( actionCmd, -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
