1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-21 18:11:06 +00:00

fix: update reusable workflow input handling (#2349)

* update reusable workflow input handling

* make test stricter

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 44d7ad54b07530793bbf965598636c8378beb3f9)
This commit is contained in:
ChristopherHX 2024-06-05 16:30:12 +02:00 committed by Earl Warren
parent 4e5a3025d7
commit cfa86631af
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 23 additions and 20 deletions

View file

@ -162,7 +162,7 @@ func (w *Workflow) WorkflowDispatchConfig() *WorkflowDispatch {
type WorkflowCallInput struct {
Description string `yaml:"description"`
Required bool `yaml:"required"`
Default string `yaml:"default"`
Default yaml.Node `yaml:"default"`
Type string `yaml:"type"`
}

View file

@ -520,7 +520,7 @@ func getEvaluatorInputs(ctx context.Context, rc *RunContext, step step, ghc *mod
for k, v := range config.Inputs {
value := nestedMapLookup(ghc.Event, "inputs", k)
if value == nil {
value = v.Default
v.Default.Decode(&value)
}
if v.Type == "boolean" {
inputs[k] = value == "true"
@ -539,21 +539,24 @@ func setupWorkflowInputs(ctx context.Context, inputs *map[string]interface{}, rc
for name, input := range config.Inputs {
value := rc.caller.runContext.Run.Job().With[name]
if value != nil {
if str, ok := value.(string); ok {
node := yaml.Node{}
_ = node.Encode(value)
if rc.caller.runContext.ExprEval != nil {
// evaluate using the calling RunContext (outside)
value = rc.caller.runContext.ExprEval.Interpolate(ctx, str)
_ = rc.caller.runContext.ExprEval.EvaluateYamlNode(ctx, &node)
}
_ = node.Decode(&value)
}
if value == nil && config != nil && config.Inputs != nil {
value = input.Default
def := input.Default
if rc.ExprEval != nil {
if str, ok := value.(string); ok {
// evaluate using the called RunContext (inside)
value = rc.ExprEval.Interpolate(ctx, str)
}
_ = rc.ExprEval.EvaluateYamlNode(ctx, &def)
}
_ = def.Decode(&value)
}
(*inputs)[name] = value

View file

@ -45,23 +45,23 @@ jobs:
- name: test required bool
run: |
echo inputs.bool_required=${{ inputs.bool_required }}
[[ "${{ inputs.bool_required }}" = "true" ]] || exit 1
echo inputs.bool_required=${{ tojson(inputs.bool_required) }}
[[ "${{ tojson(inputs.bool_required) }}" = "true" ]] || exit 1
- name: test optional bool
run: |
echo inputs.bool_optional=${{ inputs.bool_optional }}
[[ "${{ inputs.bool_optional }}" = "true" ]] || exit 1
echo inputs.bool_optional=${{ tojson(inputs.bool_optional) }}
[[ "${{ tojson(inputs.bool_optional) }}" = "true" ]] || exit 1
- name: test required number
run: |
echo inputs.number_required=${{ inputs.number_required }}
[[ "${{ inputs.number_required == 1 }}" = "true" ]] || exit 1
echo inputs.number_required=${{ tojson(inputs.number_required) }}
[[ "${{ tojson(inputs.number_required) == '1' }}" = "true" ]] || exit 1
- name: test optional number
run: |
echo inputs.number_optional=${{ inputs.number_optional }}
[[ "${{ inputs.number_optional == 1 }}" = "true" ]] || exit 1
echo inputs.number_optional=${{ tojson(inputs.number_optional) }}
[[ "${{ tojson(inputs.number_optional) == '1' }}" = "true" ]] || exit 1
- name: test secret
run: |