Fix merge with master

tektoncd · Apr 2, 2020 · c472c8a · c472c8a
1 parent 989338d
commit c472c8a
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/pkg/apis/pipeline/v1beta1/param_types.go b/pkg/apis/pipeline/v1beta1/param_types.go
@@ -165,22 +165,9 @@ var variableSubstitutionRegex = regexp.MustCompile(variableSubstitutionFormat)
 // NewResultRefs extracts all ResultReferences from a param or a pipeline result.
 // If the ResultReference can be extracted, they are returned. Otherwise an error is returned
 func NewResultRefs(obj interface{}) ([]*ResultRef, error) {
-	var substitutionExpressions []string
-	var ok bool
-	switch t := obj.(type) {
-	case Param:
-		if t.Value.Type != ParamTypeString {
-			return nil, fmt.Errorf("Invalid result reference expression: must contain variable substitution %q", resultExpressionFormat)
-		}
-		substitutionExpressions, ok = getVarSubstitutionExpressions(t.Value.StringVal)
-		if !ok {
-			return nil, fmt.Errorf("Invalid result reference expression: must contain variable substitution %q", resultExpressionFormat)
-		}
-	case PipelineResult:
-		substitutionExpressions, ok = getVarSubstitutionExpressions(t.Value)
-		if !ok {
-			return nil, fmt.Errorf("Invalid result reference expression: must contain variable substitution %q", resultExpressionFormat)
-		}
+	substitutionExpressions, ok := getVarSubstitutionExpressions(obj)
+	if !ok {
+		return nil, fmt.Errorf("Invalid result reference expression: must contain variable substitution %q", resultExpressionFormat)
 	}
 	var resultRefs []*ResultRef
 	for _, expression := range substitutionExpressions {