go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2024-12-04 10:24:45 +02:00
Code Issues Releases Activity

fix: bug where non-nil, empty dynamic variables are returned as an empty interface (#1904)

Browse Source
This commit is contained in:
Pete Davison 2024-11-04 13:30:39 +00:00 committed by GitHub
parent 28a96d1427
commit 148b090d8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/compiler/compiler.go
View File

@ -74,8 +74,8 @@ func (c *Compiler) getVariables(t *ast.Task, call *ast.Call, evaluateShVars bool
if err := cache.Err(); err != nil { if err := cache.Err(); err != nil {
return err return err
} }
// If the variable is not dynamic, we can set it and return // If the variable is already set, we can set it and return
if newVar.Value != nil || newVar.Sh == "" { if newVar.Value != nil {
result.Set(k, ast.Var{Value: newVar.Value}) result.Set(k, ast.Var{Value: newVar.Value})
return nil return nil
} }
@ -136,10 +136,15 @@ func (c *Compiler) HandleDynamicVar(v ast.Var, dir string) (string, error) {
c.muDynamicCache.Lock() c.muDynamicCache.Lock()
defer c.muDynamicCache.Unlock() defer c.muDynamicCache.Unlock()
// If the variable is not dynamic or it is empty, return an empty string
if v.Sh == nil || *v.Sh == "" {
return "", nil
}
if c.dynamicCache == nil { if c.dynamicCache == nil {
c.dynamicCache = make(map[string]string, 30) c.dynamicCache = make(map[string]string, 30)
} }
if result, ok := c.dynamicCache[v.Sh]; ok { if result, ok := c.dynamicCache[*v.Sh]; ok {
return result, nil return result, nil
} }
@ -150,7 +155,7 @@ func (c *Compiler) HandleDynamicVar(v ast.Var, dir string) (string, error) {
var stdout bytes.Buffer var stdout bytes.Buffer
opts := &execext.RunCommandOptions{ opts := &execext.RunCommandOptions{
Command: v.Sh, Command: *v.Sh,
Dir: dir, Dir: dir,
Stdout: &stdout, Stdout: &stdout,
Stderr: c.Logger.Stderr, Stderr: c.Logger.Stderr,
@ -164,7 +169,7 @@ func (c *Compiler) HandleDynamicVar(v ast.Var, dir string) (string, error) {
result := strings.TrimSuffix(stdout.String(), "\r\n") result := strings.TrimSuffix(stdout.String(), "\r\n")
result = strings.TrimSuffix(result, "\n") result = strings.TrimSuffix(result, "\n")
c.dynamicCache[v.Sh] = result c.dynamicCache[*v.Sh] = result
c.Logger.VerboseErrf(logger.Magenta, "task: dynamic variable: %q result: %q\n", v.Sh, result) c.Logger.VerboseErrf(logger.Magenta, "task: dynamic variable: %q result: %q\n", v.Sh, result)
return result, nil return result, nil

10
taskfile/ast/var.go
View File

@ -20,7 +20,7 @@ type Vars struct {
func (vs *Vars) ToCacheMap() (m map[string]any) { func (vs *Vars) ToCacheMap() (m map[string]any) {
m = make(map[string]any, vs.Len()) m = make(map[string]any, vs.Len())
_ = vs.Range(func(k string, v Var) error { _ = vs.Range(func(k string, v Var) error {
if v.Sh != "" { if v.Sh != nil && *v.Sh != "" {
// Dynamic variable is not yet resolved; trigger // Dynamic variable is not yet resolved; trigger
// <no value> to be used in templates. // <no value> to be used in templates.
return nil return nil
@ -81,7 +81,7 @@ func (vs *Vars) DeepCopy() *Vars {
type Var struct { type Var struct {
Value any Value any
Live any Live any
Sh string Sh *string
Ref string Ref string
Dir string Dir string
} }
@ -98,7 +98,7 @@ func (v *Var) UnmarshalYAML(node *yaml.Node) error {
// If the value is a string and it starts with $, then it's a shell command // If the value is a string and it starts with $, then it's a shell command
if str, ok := value.(string); ok { if str, ok := value.(string); ok {
if str, ok = strings.CutPrefix(str, "$"); ok { if str, ok = strings.CutPrefix(str, "$"); ok {
v.Sh = str v.Sh = &str
return nil return nil
} }
if str, ok = strings.CutPrefix(str, "#"); ok { if str, ok = strings.CutPrefix(str, "#"); ok {
@ -118,7 +118,7 @@ func (v *Var) UnmarshalYAML(node *yaml.Node) error {
switch key { switch key {
case "sh", "ref", "map": case "sh", "ref", "map":
var m struct { var m struct {
Sh string Sh *string
Ref string Ref string
Map any Map any
} }
@ -150,7 +150,7 @@ func (v *Var) UnmarshalYAML(node *yaml.Node) error {
switch key { switch key {
case "sh", "ref": case "sh", "ref":
var m struct { var m struct {
Sh string Sh *string
Ref string Ref string
} }
if err := node.Decode(&m); err != nil { if err := node.Decode(&m); err != nil {

4
variables.go
View File

@ -112,7 +112,7 @@ func (e *Executor) compiledTask(call *ast.Call, evaluateShVars bool) (*ast.Task,
if evaluateShVars { if evaluateShVars {
err = new.Env.Range(func(k string, v ast.Var) error { err = new.Env.Range(func(k string, v ast.Var) error {
// If the variable is not dynamic, we can set it and return // If the variable is not dynamic, we can set it and return
if v.Value != nil || v.Sh == "" { if v.Value != nil || v.Sh == nil {
new.Env.Set(k, ast.Var{Value: v.Value}) new.Env.Set(k, ast.Var{Value: v.Value})
return nil return nil
} }
@ -301,7 +301,7 @@ func itemsFromFor(
// If the variable is dynamic, then it hasn't been resolved yet // If the variable is dynamic, then it hasn't been resolved yet
// and we can't use it as a list. This happens when fast compiling a task // and we can't use it as a list. This happens when fast compiling a task
// for use in --list or --list-all etc. // for use in --list or --list-all etc.
if v.Value != nil && v.Sh == "" { if v.Value != nil && v.Sh == nil {
switch value := v.Value.(type) { switch value := v.Value.(type) {
case string: case string:
if f.Split != "" { if f.Split != "" {