mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-08-06 00:44:22 +02:00
fix: coerce every expression value kind to a string and drop the format() panic (#1135)
`coerceToString` covered only a few kinds and returned the unconverted `reflect.Value` for the rest, so callers rendered contexts as `<*model.GithubContext Value>` and mangled sized integers and floats the same way. It now returns a string, which makes that placeholder unrepresentable, and is exported as `CoerceToString` so Gitea can drop its own diverging copy. It also takes an already reflected value, so internal callers need no conversion and no guard against the zero `Value`.
`format()` panicked whenever a lone `}` was followed by anything other than another `}`. Only a trailing `}` reached the existing unmatched-brace check, so an expression such as `format('a}b')`, which any workflow can write, took the process down instead. It now returns that same error.
Reviewed-on: https://gitea.com/gitea/runner/pulls/1135
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
@@ -6,6 +6,7 @@ package exprparser
|
||||
|
||||
import (
|
||||
"math"
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"gitea.com/gitea/runner/act/model"
|
||||
@@ -633,3 +634,51 @@ func TestContexts(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestCoerceToString(t *testing.T) {
|
||||
type object struct{ Name string }
|
||||
obj := object{Name: "x"}
|
||||
var nilPointer *object
|
||||
var nilMap map[string]any
|
||||
var nilSlice []any
|
||||
|
||||
table := []struct {
|
||||
input any
|
||||
expected string
|
||||
name string
|
||||
}{
|
||||
{nil, "", "null"},
|
||||
{true, "true", "true"},
|
||||
{false, "false", "false"},
|
||||
{"foo", "foo", "string"},
|
||||
{"", "", "empty-string"},
|
||||
{123, "123", "int"},
|
||||
{int64(-9), "-9", "int64"},
|
||||
{uint8(7), "7", "uint8"},
|
||||
{1.0, "1", "float-integral"},
|
||||
{-9.7, "-9.7", "float"},
|
||||
{2.99e-2, "0.0299", "float-exponential"},
|
||||
{1e21, "1E+21", "float-large"},
|
||||
{float32(1.5), "1.5", "float32"},
|
||||
{math.NaN(), "NaN", "nan"},
|
||||
{math.Inf(1), "Infinity", "positive-infinity"},
|
||||
{math.Inf(-1), "-Infinity", "negative-infinity"},
|
||||
{[]any{1, 2}, "Array", "slice"},
|
||||
{nilSlice, "Array", "nil-slice"},
|
||||
{[2]int{1, 2}, "Array", "fixed-size-array"},
|
||||
{map[string]any{"a": 1}, "Object", "map"},
|
||||
{nilMap, "Object", "nil-map"},
|
||||
{obj, "Object", "struct"},
|
||||
{&obj, "Object", "pointer-to-struct"},
|
||||
{nilPointer, "", "nil-pointer"},
|
||||
{&model.GithubContext{Action: "push"}, "Object", "github-context"},
|
||||
{reflect.ValueOf(42), "42", "reflected-value"},
|
||||
{reflect.Value{}, "", "invalid-reflected-value"},
|
||||
}
|
||||
|
||||
for _, tt := range table {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
assert.Equal(t, tt.expected, CoerceToString(tt.input))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user