Skip to content

Commit

Permalink
Merge branch 'leadSlash2328' of https://github.com/underwoodb-sd-ibm/…
Browse files Browse the repository at this point in the history 
…incubator-openwhisk into leadSlash2328
  • Loading branch information
@underwoodb-sd-ibm
underwoodb-sd-ibm committed Jul 10, 2017
2 parents cb5996e + 5bc233d commit 0d6b9aa
Show file tree
Hide file tree
Showing 7 changed files with 158 additions and 156 deletions.
72 changes: 36 additions & 36 deletions tools/cli/go-whisk-cli/commands/action.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ var actionInvokeCmd = &cobra.Command{
RunE: func(cmd *cobra.Command, args []string) error {
var err error
var parameters interface{}
var qualifiedName *QualifiedName
var qualifiedName = new(QualifiedName)
var paramArgs []string

if whiskErr := checkArgs(
Expand All @@ -137,7 +137,7 @@ var actionInvokeCmd = &cobra.Command{
return NewQualifiedNameError(args[0], err)
}

client.Namespace = qualifiedName.namespace
client.Namespace = qualifiedName.GetNamespaceFromQN()
paramArgs = flags.common.param

if len(paramArgs) > 0 {
Expand All @@ -148,7 +148,7 @@ var actionInvokeCmd = &cobra.Command{
if flags.action.result {flags.common.blocking = true}

res, _, err := client.Actions.Invoke(
qualifiedName.entityName,
qualifiedName.GetEntityName(),
parameters,
flags.common.blocking,
flags.action.result)
Expand All @@ -164,29 +164,29 @@ func handleInvocationResponse(
err error) (error) {
if err == nil {
printInvocationMsg(
qualifiedName.namespace,
qualifiedName.entityName,
qualifiedName.GetNamespaceFromQN(),
qualifiedName.GetEntityName(),
getValueFromJSONResponse(ACTIVATION_ID, result),
result,
color.Output)
} else {
if !flags.common.blocking {
return handleInvocationError(err, qualifiedName.entityName, parameters)
return handleInvocationError(err, qualifiedName.GetEntityName(), parameters)
} else {
if isBlockingTimeout(err) {
printBlockingTimeoutMsg(
qualifiedName.namespace,
qualifiedName.entityName,
qualifiedName.GetNamespaceFromQN(),
qualifiedName.GetEntityName(),
getValueFromJSONResponse(ACTIVATION_ID, result))
} else if isApplicationError(err) {
printInvocationMsg(
qualifiedName.namespace,
qualifiedName.entityName,
qualifiedName.GetNamespaceFromQN(),
qualifiedName.GetEntityName(),
getValueFromJSONResponse(ACTIVATION_ID, result),
result,
colorable.NewColorableStderr())
} else {
return handleInvocationError(err, qualifiedName.entityName, parameters)
return handleInvocationError(err, qualifiedName.GetEntityName(), parameters)
}
}
}
Expand All @@ -204,7 +204,7 @@ var actionGetCmd = &cobra.Command{
var err error
var field string
var action *whisk.Action
var qualifiedName *QualifiedName
var qualifiedName = new(QualifiedName)

if whiskErr := checkArgs(args, 1, 2, "Action get", wski18n.T("An action name is required.")); whiskErr != nil {
return whiskErr
Expand All @@ -222,19 +222,19 @@ var actionGetCmd = &cobra.Command{
return NewQualifiedNameError(args[0], err)
}

client.Namespace = qualifiedName.namespace
client.Namespace = qualifiedName.GetNamespaceFromQN()

if action, _, err = client.Actions.Get(qualifiedName.entityName); err != nil {
return actionGetError(qualifiedName.entityName, err)
if action, _, err = client.Actions.Get(qualifiedName.GetEntityName()); err != nil {
return actionGetError(qualifiedName.GetEntityName(), err)
}

if flags.common.summary {
printSummary(action)
} else {
if len(field) > 0 {
printActionGetWithField(qualifiedName.entityName, field, action)
printActionGetWithField(qualifiedName.GetEntityName(), field, action)
} else {
printActionGet(qualifiedName.entityName, action)
printActionGet(qualifiedName.GetEntityName(), action)
}
}

Expand All @@ -249,7 +249,7 @@ var actionDeleteCmd = &cobra.Command{
SilenceErrors: true,
PreRunE: setupClientConfig,
RunE: func(cmd *cobra.Command, args []string) error {
var qualifiedName *QualifiedName
var qualifiedName = new(QualifiedName)
var err error

if whiskErr := checkArgs(
Expand All @@ -265,13 +265,13 @@ var actionDeleteCmd = &cobra.Command{
return NewQualifiedNameError(args[0], err)
}

client.Namespace = qualifiedName.namespace
client.Namespace = qualifiedName.GetNamespaceFromQN()

if _, err = client.Actions.Delete(qualifiedName.entityName); err != nil {
return actionDeleteError(qualifiedName.entityName, err)
if _, err = client.Actions.Delete(qualifiedName.GetEntityName()); err != nil {
return actionDeleteError(qualifiedName.GetEntityName(), err)
}

printActionDeleted(qualifiedName.entityName)
printActionDeleted(qualifiedName.GetEntityName())

return nil
},
Expand All @@ -284,7 +284,7 @@ var actionListCmd = &cobra.Command{
SilenceErrors: true,
PreRunE: setupClientConfig,
RunE: func(cmd *cobra.Command, args []string) error {
var qualifiedName *QualifiedName
var qualifiedName = new(QualifiedName)
var actions []whisk.Action
var err error

Expand All @@ -302,16 +302,16 @@ var actionListCmd = &cobra.Command{
return NewQualifiedNameError(args[0], err)
}

client.Namespace = qualifiedName.namespace
client.Namespace = qualifiedName.GetNamespaceFromQN()
}

options := &whisk.ActionListOptions{
Skip: flags.common.skip,
Limit: flags.common.limit,
}

if actions, _, err = client.Actions.List(qualifiedName.entityName, options); err != nil {
return actionListError(qualifiedName.entityName, options, err)
if actions, _, err = client.Actions.List(qualifiedName.GetEntityName(), options); err != nil {
return actionListError(qualifiedName.GetEntityName(), options, err)
}

printList(actions)
Expand All @@ -328,16 +328,16 @@ func parseAction(cmd *cobra.Command, args []string, update bool) (*whisk.Action,
var parameters interface{}
var annotations interface{}

qualifiedName := new(QualifiedName)
var qualifiedName = new(QualifiedName)

if qualifiedName, err = NewQualifiedName(args[0]); err != nil {
return nil, NewQualifiedNameError(args[0], err)
}

client.Namespace = qualifiedName.namespace
client.Namespace = qualifiedName.GetNamespaceFromQN()
action := new(whisk.Action)
action.Name = qualifiedName.entityName
action.Namespace = qualifiedName.namespace
action.Name = qualifiedName.GetEntityName()
action.Namespace = qualifiedName.GetNamespaceFromQN()
action.Limits = getLimits(
cmd.LocalFlags().Changed(MEMORY_FLAG),
cmd.LocalFlags().Changed(LOG_SIZE_FLAG),
Expand Down Expand Up @@ -366,19 +366,19 @@ func parseAction(cmd *cobra.Command, args []string, update bool) (*whisk.Action,
}

if flags.action.copy {
var copiedQualifiedName *QualifiedName
var copiedQualifiedName = new(QualifiedName)

if copiedQualifiedName, err = NewQualifiedName(args[1]); err != nil {
return nil, NewQualifiedNameError(args[1], err)
}

client.Namespace = copiedQualifiedName.namespace
client.Namespace = copiedQualifiedName.GetNamespaceFromQN()

if existingAction, _, err = client.Actions.Get(copiedQualifiedName.entityName); err != nil {
return nil, actionGetError(copiedQualifiedName.entityName, err)
if existingAction, _, err = client.Actions.Get(copiedQualifiedName.GetEntityName()); err != nil {
return nil, actionGetError(copiedQualifiedName.GetEntityName(), err)
}

client.Namespace = qualifiedName.namespace
client.Namespace = qualifiedName.GetNamespaceFromQN()
action.Exec = existingAction.Exec
action.Parameters = append(action.Parameters, existingAction.Parameters...)
action.Annotations = append(action.Annotations, existingAction.Annotations...)
Expand All @@ -400,7 +400,7 @@ func parseAction(cmd *cobra.Command, args []string, update bool) (*whisk.Action,
}

if cmd.LocalFlags().Changed(WEB_FLAG) {
action.Annotations, err = webAction(flags.action.web, action.Annotations, qualifiedName.entityName, update)
action.Annotations, err = webAction(flags.action.web, action.Annotations, qualifiedName.GetEntityName(), update)
}

whisk.Debug(whisk.DbgInfo, "Parsed action struct: %#v\n", action)
Expand Down
4 changes: 2 additions & 2 deletions tools/cli/go-whisk-cli/commands/activation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var activationListCmd = &cobra.Command{
PreRunE: setupClientConfig,
RunE: func(cmd *cobra.Command, args []string) error {
var err error
var qualifiedName *QualifiedName
var qualifiedName = new(QualifiedName)

if whiskErr := checkArgs(args, 0, 1, "Activation list",
wski18n.T("An optional namespace is the only valid argument.")); whiskErr != nil {
Expand All @@ -67,7 +67,7 @@ var activationListCmd = &cobra.Command{
return NewQualifiedNameError(args[0], err)
}

client.Namespace = qualifiedName.namespace
client.Namespace = qualifiedName.GetNamespaceFromQN()
}

options := &whisk.ActivationListOptions{
Expand Down
23 changes: 11 additions & 12 deletions tools/cli/go-whisk-cli/commands/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,13 +607,13 @@ func parseApi(cmd *cobra.Command, args []string) (*whisk.Api, error) {
}

// Is the specified action name valid?
var qualifiedName *QualifiedName
var qualifiedName = new(QualifiedName)
if (len(args) == 3) {
if qualifiedName, err = NewQualifiedName(args[2]); err != nil {
return nil, NewQualifiedNameError(args[2], err)
}

if (qualifiedName.entityName == "") {
if (qualifiedName.GetEntityName() == "") {
whisk.Debug(whisk.DbgError, "Action name '%s' is invalid\n", args[2])
errMsg := wski18n.T("'{{.name}}' is not a valid action name.", map[string]interface{}{"name": args[2]})
whiskErr := whisk.MakeWskErrorFromWskError(errors.New(errMsg), err, whisk.EXITCODE_ERR_GENERAL,
Expand All @@ -636,10 +636,10 @@ func parseApi(cmd *cobra.Command, args []string) (*whisk.Api, error) {

api.Namespace = client.Config.Namespace
api.Action = new(whisk.ApiAction)
api.Action.BackendUrl = "https://" + client.Config.Host + "/api/v1/namespaces/" + qualifiedName.namespace + "/actions/" + qualifiedName.entityName
api.Action.BackendUrl = "https://" + client.Config.Host + "/api/v1/namespaces/" + qualifiedName.GetNamespaceFromQN() + "/actions/" + qualifiedName.GetEntityName()
api.Action.BackendMethod = "POST"
api.Action.Name = qualifiedName.entityName
api.Action.Namespace = qualifiedName.namespace
api.Action.Name = qualifiedName.GetEntityName()
api.Action.Namespace = qualifiedName.GetNamespaceFromQN()
api.Action.Auth = client.Config.AuthToken
api.ApiName = apiname
api.GatewayBasePath = basepath
Expand Down Expand Up @@ -780,7 +780,7 @@ var apiCreateCmdV2 = &cobra.Command{
RunE: func(cmd *cobra.Command, args []string) error {
var api *whisk.Api
var err error
var qname *QualifiedName
var qname = new(QualifiedName)

if (len(args) == 0 && flags.api.configfile == "") {
whisk.Debug(whisk.DbgError, "No swagger file and no arguments\n")
Expand Down Expand Up @@ -1398,9 +1398,8 @@ func parseApiV2(cmd *cobra.Command, args []string) (*whisk.Api, *QualifiedName,
}

// Is the specified action name valid?
var qName *QualifiedName
var qName = new(QualifiedName)
if (len(args) == 3) {
qName = &QualifiedName{}
qName, err = NewQualifiedName(args[2])
if err != nil {
whisk.Debug(whisk.DbgError, "NewQualifiedName(%s) failed: %s\n", args[2], err)
Expand All @@ -1410,7 +1409,7 @@ func parseApiV2(cmd *cobra.Command, args []string) (*whisk.Api, *QualifiedName,
whisk.DISPLAY_MSG, whisk.DISPLAY_USAGE)
return nil, nil, whiskErr
}
if (qName.entityName == "") {
if (qName.GetEntityName() == "") {
whisk.Debug(whisk.DbgError, "Action name '%s' is invalid\n", args[2])
errMsg := wski18n.T("'{{.name}}' is not a valid action name.", map[string]interface{}{"name": args[2]})
whiskErr := whisk.MakeWskErrorFromWskError(errors.New(errMsg), err, whisk.EXITCODE_ERR_GENERAL,
Expand Down Expand Up @@ -1439,10 +1438,10 @@ func parseApiV2(cmd *cobra.Command, args []string) (*whisk.Api, *QualifiedName,
} else {
urlActionPackage = "default"
}
api.Action.BackendUrl = "https://" + client.Config.Host + "/api/v1/web/" + qName.namespace + "/" + urlActionPackage + "/" + qName.entity + ".http"
api.Action.BackendUrl = "https://" + client.Config.Host + "/api/v1/web/" + qName.GetNamespaceFromQN() + "/" + urlActionPackage + "/" + qName.GetEntity() + ".http"
api.Action.BackendMethod = api.GatewayMethod
api.Action.Name = qName.entityName
api.Action.Namespace = qName.namespace
api.Action.Name = qName.GetEntityName()
api.Action.Namespace = qName.GetNamespaceFromQN()
api.Action.Auth = client.Config.AuthToken
api.ApiName = apiname
api.GatewayBasePath = basepath
Expand Down
8 changes: 4 additions & 4 deletions tools/cli/go-whisk-cli/commands/namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var namespaceGetCmd = &cobra.Command{
SilenceErrors: true,
PreRunE: setupClientConfig,
RunE: func(cmd *cobra.Command, args []string) error {
var qualifiedName *QualifiedName
var qualifiedName = new(QualifiedName)
var err error

if whiskErr := checkArgs(args, 0, 1, "Namespace get",
Expand All @@ -81,12 +81,12 @@ var namespaceGetCmd = &cobra.Command{
return NewQualifiedNameError(args[0], err)
}

if len(qualifiedName.entityName) > 0 {
return entityNameError(qualifiedName.entityName)
if len(qualifiedName.GetEntityName()) > 0 {
return entityNameError(qualifiedName.GetEntityName())
}
}

namespace, _, err := client.Namespaces.Get(qualifiedName.namespace)
namespace, _, err := client.Namespaces.Get(qualifiedName.GetNamespaceFromQN())

if err != nil {
whisk.Debug(whisk.DbgError, "client.Namespaces.Get(%s) error: %s\n", getClientNamespace(), err)
Expand Down
Loading

0 comments on commit 0d6b9aa

Please sign in to comment.