ert

Author: steven0711dong

commands/trigger.go

@@ -458,7 +458,7 @@ 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 := (enhancedFeedParams == nil && paramArray == nil && enhancedTriggerParams == nil)
+	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))
@@ -470,7 +470,7 @@ func (t *Trigger) Create(Client *whisk.Client, args []string) error {
 	if len(paramArray) > 0 || simplestTrigger {
 		if len(enhancedFeedParams) > 0 || len(enhancedTriggerParams) > 0 {
 			whisk.Debug(whisk.DbgError, "User tries to mix use of --param with --feed-param and --trigger-param")
-			errMsg := fmt.Sprintf("Incorrect usage. Cannot combine --feed-param or --trigger-param flag with --param flag\n")
+			errMsg := fmt.Sprintf("in create. 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
 		}
@@ -656,7 +656,7 @@ func (t *Trigger) Update(Client *whisk.Client, args []string) error {
 	}
 
 	//simplestTrigger indicates user are updating a trigger without any feed or parameters
-	simplestTrigger := (enhancedFeedParams == nil && Flags.common.param == nil && enhancedTriggerParams == nil)
+	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))
@@ -666,8 +666,9 @@ func (t *Trigger) Update(Client *whisk.Client, args []string) error {
 	//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")
 			whisk.Debug(whisk.DbgError, "User tries to mix use of --param with --feed-param and --trigger-param")
-			errMsg := fmt.Sprintf("Incorrect usage. Cannot combine --feed-param or --trigger-param flag with --param flag\n")
+			errMsg := fmt.Sprintf("in update. 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
 		}