Merge pull request #942 from jonjohnsonjr/fail-on-bad-subst

Fail if unknown variable is used in substitution

Author: jonjohnsonjr

pkg/build/pipeline.go

@@ -189,7 +189,7 @@ func validateWith(data map[string]string, inputs map[string]config.Input) (map[s
 	}
 
 	for k, v := range inputs {
-		if data[k] == "" && v.Default != "" {
+		if data[k] == "" {
 			data[k] = v.Default
 		}
 

pkg/build/pipeline_test.go

@@ -35,10 +35,9 @@ func Test_mutateStringFromMap(t *testing.T) {
 	}
 
 	input1 := "${{inputs.foo}} ${{inputs.baz-bah-boom}}"
-	output1, err := util.MutateStringFromMap(keys, input1)
+	_, err := util.MutateStringFromMap(keys, input1)
 
-	require.NoError(t, err)
-	require.Equal(t, output1, "foo ", "bogus variable substitution not deleted")
+	require.Error(t, err)
 }
 
 func Test_substitutionMap(t *testing.T) {

pkg/build/pipelines/autoconf/configure.yaml

@@ -16,6 +16,11 @@ inputs:
       The GNU triplet which describes the build system.
     default: ${{host.triplet.gnu}}
 
+  opts:
+    description: |
+      Options to pass to the ./configure command.
+    default: ''
+
 pipeline:
   - runs: |
       cd ${{inputs.dir}}

pkg/cond/subst.go

@@ -15,6 +15,7 @@
 package cond
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
@@ -30,18 +31,21 @@ func Subst(inputExpr string, lookupFns ...VariableLookupFunction) (string, error
 
 	whiteSpace := goparsify.Many(goparsify.Exact(" "))
 	variableName := goparsify.Chars("a-zA-Z0-9.\\-_")
+	errs := []error{}
 	variable := goparsify.Seq("${{", whiteSpace, variableName, whiteSpace, "}}").Map(func(n *goparsify.Result) {
 		if resolved, err := lookupFn(n.Child[2].Token); err == nil {
 			n.Token = resolved
 			n.Result = resolved
 		} else {
+			errs = append(errs, err)
 			n.Token = ""
 			n.Result = ""
 		}
 	})
 
 	text := goparsify.Until("${{")
 	node := goparsify.Any(text, variable)
+
 	document := goparsify.Many(node).Map(func(n *goparsify.Result) {
 		tokens := []string{}
 		for _, tok := range n.Child {
@@ -55,6 +59,10 @@ func Subst(inputExpr string, lookupFns ...VariableLookupFunction) (string, error
 		return "", fmt.Errorf("parser error: %w", err)
 	}
 
+	if err := errors.Join(errs...); err != nil {
+		return "", err
+	}
+
 	if rstr, ok := result.(string); ok {
 		return rstr, nil
 	}