fix: default param value not applied in some cases (#1254)

Signed-off-by: Derek Wang <whynowy@gmail.com>
argoproj · Jun 22, 2021 · 38cd9b6 · 38cd9b6
1 parent e92d105
commit 38cd9b6
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/sensors/triggers/params.go b/sensors/triggers/params.go
@@ -181,11 +181,16 @@ func ResolveParamValue(src *v1alpha1.TriggerParameterSource, events map[string]*
 			tmplt = src.DataTemplate
 			value, err = renderEventDataAsJSON(event)
 		}
-	}
-	if err != nil && src.Value != nil {
-		fmt.Printf("failed to parse the event data, using default value. err: %+v\n", err)
+	} else if src.Value != nil {
 		return *src.Value, nil
 	}
+	if err != nil {
+		if src.Value != nil {
+			fmt.Printf("failed to parse the event data, using default value. err: %+v\n", err)
+			return *src.Value, nil
+		}
+		return "", err
+	}
 	// Get the value corresponding to specified key within JSON object
 	if value != nil {
 		if tmplt != "" {