fix(workflow): preserve a reference's type between steps
This commit is contained in:
2 files changed
+169
-8
No files matched your search
@@ -126,21 +126,102 @@ func checkStepReference(path string, parts []string, earlier *refScope) error {
|
|||||||
|
|
||||||
var taskFields = map[string]bool{"review": true, "plan": true, "title": true, "body": true, "prompt": true, "repository": true, "kind": true, "issue": true, "pr": true}
|
var taskFields = map[string]bool{"review": true, "plan": true, "title": true, "body": true, "prompt": true, "repository": true, "kind": true, "issue": true, "pr": true}
|
||||||
|
|
||||||
|
// soleReferencePattern matches a value that is exactly one reference, which is
|
||||||
|
// what lets it carry the referenced value's own type instead of its text.
|
||||||
|
var soleReferencePattern = regexp.MustCompile(`^\s*\{\{\s*([^{}\s]+)\s*\}\}\s*$`)
|
||||||
|
|
||||||
// renderSettings returns a copy of settings with every reference replaced by
|
// renderSettings returns a copy of settings with every reference replaced by
|
||||||
// its value in this run. A reference to an absent value renders empty: a
|
// its value in this run.
|
||||||
// skipped earlier step leaves nothing behind, and that is not an error.
|
//
|
||||||
|
// A value that is exactly one reference takes that reference's own type, so a
|
||||||
|
// boolean, number, array or object crosses from one step to the next intact; a
|
||||||
|
// reference embedded in prose is interpolated as text, the only thing a string
|
||||||
|
// can hold. A reference to an absent value renders empty, which is not an
|
||||||
|
// error: a skipped earlier step leaves nothing behind.
|
||||||
func renderSettings(settings yaml.Node, tc *TaskContext) yaml.Node {
|
func renderSettings(settings yaml.Node, tc *TaskContext) yaml.Node {
|
||||||
scope := referenceScope(tc)
|
scope := referenceScope(tc)
|
||||||
rendered := deepCopyNode(&settings)
|
rendered := deepCopyNode(&settings)
|
||||||
walkStrings(rendered, func(value string) string {
|
renderNode(rendered, scope)
|
||||||
return referencePattern.ReplaceAllStringFunc(value, func(token string) string {
|
|
||||||
path := referencePattern.FindStringSubmatch(token)[1]
|
|
||||||
return stringify(lookup(scope, strings.Split(path, ".")))
|
|
||||||
})
|
|
||||||
})
|
|
||||||
return *rendered
|
return *rendered
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// renderNode replaces references in a settings node's string values, in place.
|
||||||
|
// Mapping keys are interpolated as text: a key names a field, so it has no
|
||||||
|
// typed value to carry.
|
||||||
|
func renderNode(node *yaml.Node, scope map[string]any) {
|
||||||
|
switch node.Kind {
|
||||||
|
case yaml.DocumentNode, yaml.SequenceNode:
|
||||||
|
for _, child := range node.Content {
|
||||||
|
renderNode(child, scope)
|
||||||
|
}
|
||||||
|
case yaml.MappingNode:
|
||||||
|
for i := 0; i+1 < len(node.Content); i += 2 {
|
||||||
|
interpolateNode(node.Content[i], scope)
|
||||||
|
renderNode(node.Content[i+1], scope)
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
if node.Tag == "!!str" {
|
||||||
|
renderValue(node, scope)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// renderValue replaces one string value's references. A value that is exactly
|
||||||
|
// one reference takes the referenced value's type; otherwise its references
|
||||||
|
// are interpolated as text.
|
||||||
|
func renderValue(node *yaml.Node, scope map[string]any) {
|
||||||
|
if path, ok := soleReference(node.Value); ok {
|
||||||
|
setNodeValue(node, lookup(scope, strings.Split(path, ".")))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
interpolateNode(node, scope)
|
||||||
|
}
|
||||||
|
|
||||||
|
// interpolateNode replaces every reference in one string node with its text.
|
||||||
|
func interpolateNode(node *yaml.Node, scope map[string]any) {
|
||||||
|
if node.Kind != yaml.ScalarNode || node.Tag != "!!str" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
node.Value = referencePattern.ReplaceAllStringFunc(node.Value, func(token string) string {
|
||||||
|
path := referencePattern.FindStringSubmatch(token)[1]
|
||||||
|
return stringify(lookup(scope, strings.Split(path, ".")))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// soleReference returns the path of the one reference value is, when value is
|
||||||
|
// nothing but that reference.
|
||||||
|
func soleReference(value string) (string, bool) {
|
||||||
|
match := soleReferencePattern.FindStringSubmatch(value)
|
||||||
|
if match == nil {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
return match[1], true
|
||||||
|
}
|
||||||
|
|
||||||
|
// setNodeValue replaces a scalar node with the node for value, so the value's
|
||||||
|
// type survives the trip. An absent reference renders empty, the documented
|
||||||
|
// rendering of nothing. A value yaml cannot carry keeps the reference text,
|
||||||
|
// which reads better than dropping the setting.
|
||||||
|
func setNodeValue(node *yaml.Node, value any) {
|
||||||
|
if value == nil {
|
||||||
|
node.Value = ""
|
||||||
|
return
|
||||||
|
}
|
||||||
|
raw, err := yaml.Marshal(value)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var replacement yaml.Node
|
||||||
|
if err := yaml.Unmarshal(raw, &replacement); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
content := &replacement
|
||||||
|
if replacement.Kind == yaml.DocumentNode && len(replacement.Content) == 1 {
|
||||||
|
content = replacement.Content[0]
|
||||||
|
}
|
||||||
|
*node = *content
|
||||||
|
}
|
||||||
|
|
||||||
func referenceScope(tc *TaskContext) map[string]any {
|
func referenceScope(tc *TaskContext) map[string]any {
|
||||||
t := tc.Task
|
t := tc.Task
|
||||||
steps := make(map[string]any, len(tc.stepResults))
|
steps := make(map[string]any, len(tc.stepResults))
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package workflow
|
package workflow
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
@@ -202,6 +203,85 @@ steps:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestRenderSettingsPreservesTypes pins the reference contract between steps:
|
||||||
|
// a setting that is exactly one reference takes the referenced value's type,
|
||||||
|
// so booleans, numbers, arrays and objects survive; a reference embedded in
|
||||||
|
// prose is interpolated as text, which is the only thing a string can hold.
|
||||||
|
func TestRenderSettingsPreservesTypes(t *testing.T) {
|
||||||
|
src := `
|
||||||
|
flag: "{{ steps.plan.result.fit }}"
|
||||||
|
count: "{{ steps.plan.result.count }}"
|
||||||
|
items: "{{ steps.plan.result.labels }}"
|
||||||
|
nested: "{{ steps.plan.result.meta }}"
|
||||||
|
whole: "{{ steps.plan.result }}"
|
||||||
|
text: "fit is {{ steps.plan.result.fit }}"
|
||||||
|
prose: "labels: {{ steps.plan.result.labels }}"
|
||||||
|
absent: "{{ steps.plan.result.missing }}"
|
||||||
|
raw: "{{ steps.plan.summary }}"
|
||||||
|
`
|
||||||
|
var settings yaml.Node
|
||||||
|
if err := yaml.Unmarshal([]byte(src), &settings); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
tc := &TaskContext{Task: &Task{Title: "t"}, stepResults: map[string]StepResult{
|
||||||
|
"plan": {
|
||||||
|
Summary: "the plan",
|
||||||
|
Result: map[string]any{
|
||||||
|
"fit": true,
|
||||||
|
"count": float64(3),
|
||||||
|
"labels": []any{"a", "b"},
|
||||||
|
"meta": map[string]any{"k": "v"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
var got struct {
|
||||||
|
Flag bool `yaml:"flag"`
|
||||||
|
Count int `yaml:"count"`
|
||||||
|
Items []string `yaml:"items"`
|
||||||
|
Nested map[string]string `yaml:"nested"`
|
||||||
|
Whole map[string]any `yaml:"whole"`
|
||||||
|
Text string `yaml:"text"`
|
||||||
|
Prose string `yaml:"prose"`
|
||||||
|
Absent string `yaml:"absent"`
|
||||||
|
Raw string `yaml:"raw"`
|
||||||
|
}
|
||||||
|
rendered := renderSettings(settings, tc)
|
||||||
|
if err := rendered.Decode(&got); err != nil {
|
||||||
|
t.Fatalf("decode rendered settings: %v", err)
|
||||||
|
}
|
||||||
|
if !got.Flag {
|
||||||
|
t.Error("flag: a boolean reference did not survive as a boolean")
|
||||||
|
}
|
||||||
|
if got.Count != 3 {
|
||||||
|
t.Errorf("count = %d, want 3", got.Count)
|
||||||
|
}
|
||||||
|
if !slices.Equal(got.Items, []string{"a", "b"}) {
|
||||||
|
t.Errorf("items = %v, want [a b]", got.Items)
|
||||||
|
}
|
||||||
|
if got.Nested["k"] != "v" {
|
||||||
|
t.Errorf("nested = %v, want k=v", got.Nested)
|
||||||
|
}
|
||||||
|
if got.Whole["fit"] != true || got.Whole["count"] != 3 {
|
||||||
|
t.Errorf("whole = %v, want the whole result object", got.Whole)
|
||||||
|
}
|
||||||
|
if got.Text != "fit is true" {
|
||||||
|
t.Errorf("text = %q, want %q", got.Text, "fit is true")
|
||||||
|
}
|
||||||
|
if got.Prose != `labels: ["a","b"]` {
|
||||||
|
t.Errorf("prose = %q, want the array as text", got.Prose)
|
||||||
|
}
|
||||||
|
if got.Absent != "" {
|
||||||
|
t.Errorf("absent = %q, want empty", got.Absent)
|
||||||
|
}
|
||||||
|
if got.Raw != "the plan" {
|
||||||
|
t.Errorf("raw = %q, want %q", got.Raw, "the plan")
|
||||||
|
}
|
||||||
|
// The definition is not mutated: rendering works on a copy.
|
||||||
|
if original := yamlString(t, settings); !strings.Contains(original, "{{ steps.plan.summary }}") {
|
||||||
|
t.Fatalf("rendering changed the definition: %s", original)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func yamlString(t *testing.T, node yaml.Node) string {
|
func yamlString(t *testing.T, node yaml.Node) string {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
out, err := yaml.Marshal(&node)
|
out, err := yaml.Marshal(&node)
|
||||||
|
|||||||
Reference in new issue
Block a user