1
0
mirror of https://github.com/go-task/task.git synced 2025-01-26 05:27:15 +02:00

fix: deep copying pointers inside slices (#1072)

This commit is contained in:
Pete Davison 2023-03-25 19:13:06 +00:00 committed by GitHub
parent d72eb009e4
commit cc1fd3d03e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 105 additions and 35 deletions

View File

@ -15,6 +15,7 @@
arguments not whitespaces
([#1040](https://github.com/go-task/task/issues/1040), [#1059](https://github.com/go-task/task/pull/1059) by @dhanusaputra).
- Fix the value of `{{.CHECKSUM}}` variable in status ([#1076](https://github.com/go-task/task/issues/1076), [#1080](https://github.com/go-task/task/pull/1080) by @pd93).
- Fixed deep copy implementation ([#1072](https://github.com/go-task/task/pull/1072) by @pd93)
## v3.22.0 - 2023-03-10

View File

@ -19,10 +19,21 @@ type Cmd struct {
Platforms []*Platform
}
// Dep is a task dependency
type Dep struct {
Task string
Vars *Vars
func (c *Cmd) DeepCopy() *Cmd {
if c == nil {
return nil
}
return &Cmd{
Cmd: c.Cmd,
Silent: c.Silent,
Task: c.Task,
Set: deepCopySlice(c.Set),
Shopt: deepCopySlice(c.Shopt),
Vars: c.Vars.DeepCopy(),
IgnoreError: c.IgnoreError,
Defer: c.Defer,
Platforms: deepCopySlice(c.Platforms),
}
}
func (c *Cmd) UnmarshalYAML(node *yaml.Node) error {
@ -94,30 +105,3 @@ func (c *Cmd) UnmarshalYAML(node *yaml.Node) error {
return fmt.Errorf("yaml: line %d: cannot unmarshal %s into command", node.Line, node.ShortTag())
}
func (d *Dep) UnmarshalYAML(node *yaml.Node) error {
switch node.Kind {
case yaml.ScalarNode:
var task string
if err := node.Decode(&task); err != nil {
return err
}
d.Task = task
return nil
case yaml.MappingNode:
var taskCall struct {
Task string
Vars *Vars
}
if err := node.Decode(&taskCall); err != nil {
return err
}
d.Task = taskCall.Task
d.Vars = taskCall.Vars
return nil
}
return fmt.Errorf("cannot unmarshal %s into dependency", node.ShortTag())
}

View File

@ -1,23 +1,35 @@
package taskfile
import "golang.org/x/exp/constraints"
type DeepCopier[T any] interface {
DeepCopy() T
}
func deepCopySlice[T any](orig []T) []T {
if orig == nil {
return nil
}
c := make([]T, len(orig))
copy(c, orig)
for i, v := range orig {
if copyable, ok := any(v).(DeepCopier[T]); ok {
c[i] = copyable.DeepCopy()
} else {
c[i] = v
}
}
return c
}
func deepCopyMap[K constraints.Ordered, V any](orig map[K]V) map[K]V {
func deepCopyMap[K comparable, V any](orig map[K]V) map[K]V {
if orig == nil {
return nil
}
c := make(map[K]V, len(orig))
for k, v := range orig {
c[k] = v
if copyable, ok := any(v).(DeepCopier[V]); ok {
c[k] = copyable.DeepCopy()
} else {
c[k] = v
}
}
return c
}

50
taskfile/dep.go Normal file
View File

@ -0,0 +1,50 @@
package taskfile
import (
"fmt"
"gopkg.in/yaml.v3"
)
// Dep is a task dependency
type Dep struct {
Task string
Vars *Vars
}
func (d *Dep) DeepCopy() *Dep {
if d == nil {
return nil
}
return &Dep{
Task: d.Task,
Vars: d.Vars.DeepCopy(),
}
}
func (d *Dep) UnmarshalYAML(node *yaml.Node) error {
switch node.Kind {
case yaml.ScalarNode:
var task string
if err := node.Decode(&task); err != nil {
return err
}
d.Task = task
return nil
case yaml.MappingNode:
var taskCall struct {
Task string
Vars *Vars
}
if err := node.Decode(&taskCall); err != nil {
return err
}
d.Task = taskCall.Task
d.Vars = taskCall.Vars
return nil
}
return fmt.Errorf("cannot unmarshal %s into dependency", node.ShortTag())
}

View File

@ -15,6 +15,16 @@ type Platform struct {
Arch string
}
func (p *Platform) DeepCopy() *Platform {
if p == nil {
return nil
}
return &Platform{
OS: p.OS,
Arch: p.Arch,
}
}
type ErrInvalidPlatform struct {
Platform string
}

View File

@ -18,6 +18,16 @@ type Precondition struct {
Msg string
}
func (p *Precondition) DeepCopy() *Precondition {
if p == nil {
return nil
}
return &Precondition{
Sh: p.Sh,
Msg: p.Msg,
}
}
// UnmarshalYAML implements yaml.Unmarshaler interface.
func (p *Precondition) UnmarshalYAML(node *yaml.Node) error {
switch node.Kind {

View File

@ -131,6 +131,9 @@ func (t *Task) UnmarshalYAML(node *yaml.Node) error {
// DeepCopy creates a new instance of Task and copies
// data by value from the source struct.
func (t *Task) DeepCopy() *Task {
if t == nil {
return nil
}
c := &Task{
Task: t.Task,
Cmds: deepCopySlice(t.Cmds),