remove unce

Author: steven0711dong

commands/trigger.go

@@ -440,15 +440,11 @@ func (t *Trigger) Create(Client *whisk.Client, args []string) error {
 		return NewQualifiedNameError(args[0], err)
 	}
 
-	paramArray := Flags.common.param
 	annotationArray := Flags.common.annotation
-	feedName := Flags.common.feed
-	enhancedFeedParams := Flags.trigger.feedParam
-	enhancedTriggerParams := Flags.trigger.triggerParam
 	authToken := Client.Config.AuthToken
 
 	// if a feed is specified, create additional parameters which must be passed to the feed
-	feedQualifiedName, additionalFeedParams := feedParameters(feedName, FEED_CREATE, triggerName, authToken)
+	feedQualifiedName, additionalFeedParams := feedParameters(Flags.common.feed, FEED_CREATE, triggerName, authToken)
 
 	// if a feed is specified, add feed annotation the annotations declared on the command line
 	// TODO: add test to ensure that generated annotation has precedence
@@ -458,26 +454,22 @@ func (t *Trigger) Create(Client *whisk.Client, args []string) error {
 	annotations := getParameters(annotationArray, true, true)
 
 	//simplestTrigger indicates user are creating a trigger without any feed or parameters
-	simplestTrigger := (len(enhancedFeedParams) == 0 && len(paramArray) == 0 && len(enhancedTriggerParams) == 0)
-	fmt.Println("test frameowrk might need to be updated")
-	fmt.Println(len(paramArray))
-	fmt.Println(len(enhancedFeedParams))
-	fmt.Println(len(enhancedTriggerParams))
+	simplestTrigger := (len(Flags.trigger.feedParam) == 0 && len(Flags.common.param) == 0 && len(Flags.trigger.triggerParam) == 0)
 
 	//if users are 1. creating a trigger without any feed or parameters
 	//             2. creating a trigger using --param flag
 	//then we use the old way to create the trigger.
-	if len(paramArray) > 0 || simplestTrigger {
-		if len(enhancedFeedParams) > 0 || len(enhancedTriggerParams) > 0 {
+	if len(Flags.common.param) > 0 || simplestTrigger {
+		if len(Flags.trigger.feedParam) > 0 || len(Flags.trigger.triggerParam) > 0 {
 			whisk.Debug(whisk.DbgError, "User tries to mix use of --param with --feed-param and --trigger-param")
-			errMsg := fmt.Sprintf("in create. Incorrect usage. Cannot combine --feed-param or --trigger-param flag with --param flag\n")
+			errMsg := fmt.Sprintf("Incorrect usage. Cannot combine --feed-param or --trigger-param flag with --param flag\n")
 			fmt.Fprintf(os.Stderr, "%s%s", color.RedString("error: "), errors.New(errMsg))
 			return nil
 		}
 
 		// the feed receives all the parameters that are specified on the command line so we merge
 		// the feed lifecycle parameters with the command line ones
-		parameters := getParameters(append(paramArray, additionalFeedParams...), feedQualifiedName == nil, false)
+		parameters := getParameters(append(Flags.common.param, additionalFeedParams...), feedQualifiedName == nil, false)
 
 		trigger := &whisk.Trigger{
 			Name:        triggerName.GetEntityName(),
@@ -514,7 +506,7 @@ func (t *Trigger) Create(Client *whisk.Client, args []string) error {
 
 				return werr
 			} else {
-				whisk.Debug(whisk.DbgInfo, "Successfully configured trigger feed via feed action '%s'\n", feedName)
+				whisk.Debug(whisk.DbgInfo, "Successfully configured trigger feed via feed action '%s'\n", Flags.common.feed)
 
 				// preserve existing behavior where output of feed activation is emitted to console
 				printInvocationMsg(*feedQualifiedName, true, true, res, color.Output)
@@ -531,17 +523,17 @@ func (t *Trigger) Create(Client *whisk.Client, args []string) error {
 	//then we know the users are trying to separate trigger and feed params and
 	//we use the enhanced way to create trigger
 
-	if feedQualifiedName == nil && enhancedFeedParams != nil {
+	if feedQualifiedName == nil && len(Flags.trigger.feedParam) > 0 {
 		//trigger without feed names cannot have a feed param
 		errMsg := fmt.Sprintf("Incorrect usage. trigger without a feed cannot have feed parameters. \n")
 		fmt.Fprintf(os.Stderr, "%s%s", color.RedString("error: "), errors.New(errMsg))
 		return nil
 	}
 
-	triggerParams := getParameters(enhancedTriggerParams, true, false)
+	triggerParams := getParameters(Flags.trigger.triggerParam, true, false)
 	//if a feed is specified, add feed annotation the annotations declared on the command line
 	//TODO: add test to ensure that generated annotation has precedence
-	feedParams := getParameters(append(enhancedFeedParams, additionalFeedParams...), feedQualifiedName == nil, false)
+	feedParams := getParameters(append(Flags.trigger.feedParam, additionalFeedParams...), feedQualifiedName == nil, false)
 
 	trigger := &whisk.Trigger{
 		Name:        triggerName.GetEntityName(),
@@ -572,7 +564,7 @@ func (t *Trigger) Create(Client *whisk.Client, args []string) error {
 
 			return werr
 		}
-		whisk.Debug(whisk.DbgInfo, "Successfully configured trigger feed via feed action '%s'\n", feedName)
+		whisk.Debug(whisk.DbgInfo, "Successfully configured trigger feed via feed action '%s'\n", Flags.common.feed)
 		// preserve existing behavior where output of feed activation is emitted to console
 		printInvocationMsg(*feedQualifiedName, true, true, res, color.Output)
 
@@ -614,10 +606,8 @@ func (t *Trigger) Update(Client *whisk.Client, args []string) error {
 		return werr
 	}
 
-	enhancedFeedParams := Flags.trigger.feedParam
-	enhancedTriggerParams := Flags.trigger.triggerParam
+	whisk.Debug(whisk.DbgInfo, "Parsing parameters: %#v\n", Flags.trigger.triggerParam)
 	triggerParameters, err := getJSONFromStrings(Flags.trigger.triggerParam, true)
-
 	if err != nil {
 		whisk.Debug(whisk.DbgError, "getJSONFromStrings(%#v, true) failed: %s\n", Flags.common.param, err)
 		errStr := wski18n.T("Invalid parameter argument '{{.param}}': {{.err}}",
@@ -655,20 +645,22 @@ func (t *Trigger) Update(Client *whisk.Client, args []string) error {
 		fullFeedName = getValueString(retTrigger.Annotations, "feed")
 	}
 
+	trigger := &whisk.Trigger{
+		Name:        qualifiedName.GetEntityName(),
+		Parameters:  parameters.(whisk.KeyValueArr),
+		Annotations: annotations.(whisk.KeyValueArr),
+	}
+
 	//simplestTrigger indicates user are updating a trigger without any feed or parameters
-	simplestTrigger := (len(enhancedFeedParams) == 0 && len(Flags.common.param) == 0 && len(enhancedTriggerParams) == 0)
-	fmt.Println("23")
-	fmt.Println(len(Flags.common.param))
-	fmt.Println(len(enhancedFeedParams))
-	fmt.Println(len(enhancedTriggerParams))
+	simplestTrigger := (len(Flags.trigger.feedParam) == 0 && len(Flags.common.param) == 0 && len(Flags.trigger.triggerParam) == 0)
+
 	//if users are 1. creating a trigger without any feed or parameters
 	//             2. creating a trigger using --param flag
 	//then we use the old way to create the trigger.
 	if len(Flags.common.param) > 0 || simplestTrigger {
-		if len(enhancedFeedParams) > 0 || len(enhancedTriggerParams) > 0 {
-			fmt.Println("in update")
+		if len(Flags.trigger.feedParam) > 0 || len(Flags.trigger.triggerParam) > 0 {
 			whisk.Debug(whisk.DbgError, "User tries to mix use of --param with --feed-param and --trigger-param")
-			errMsg := fmt.Sprintf("in update. Incorrect usage. Cannot combine --feed-param or --trigger-param flag with --param flag\n")
+			errMsg := fmt.Sprintf("Incorrect usage. Cannot combine --feed-param or --trigger-param flag with --param flag\n")
 			fmt.Fprintf(os.Stderr, "%s%s", color.RedString("error: "), errors.New(errMsg))
 			return nil
 		}
@@ -690,12 +682,6 @@ func (t *Trigger) Update(Client *whisk.Client, args []string) error {
 				return werr
 			}
 		} else {
-			trigger := &whisk.Trigger{
-				Name:        qualifiedName.GetEntityName(),
-				Parameters:  parameters.(whisk.KeyValueArr),
-				Annotations: annotations.(whisk.KeyValueArr),
-			}
-
 			_, _, err = Client.Triggers.Insert(trigger, true)
 			if err != nil {
 				whisk.Debug(whisk.DbgError, "Client.Triggers.Insert(%+v,true) failed: %s\n", trigger, err)
@@ -713,11 +699,7 @@ func (t *Trigger) Update(Client *whisk.Client, args []string) error {
 		return nil
 	}
 
-	trigger := &whisk.Trigger{
-		Name:        qualifiedName.GetEntityName(),
-		Parameters:  triggerParameters.(whisk.KeyValueArr),
-		Annotations: annotations.(whisk.KeyValueArr),
-	}
+	trigger.Parameters = triggerParameters.(whisk.KeyValueArr)
 	_, _, err = Client.Triggers.Insert(trigger, true)
 	if err != nil {
 		whisk.Debug(whisk.DbgError, "Client.Triggers.Insert(%+v,true) failed: %s\n", trigger, err)