upstream/vagrant
1
0
Fork 0
mirror of https://github.com/hashicorp/vagrant.git synced 2026-06-14 19:20:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Prevent parent overwrites during upserts

Browse source
This commit is contained in:
Chris Roberts 2023-06-12 09:20:29 -07:00
parent 02f844a05d
commit dcb517e1fb
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/server/singleprocess/state/project.go
View file

@ -89,6 +89,7 @@ func (p *Project) BeforeSave(tx *gorm.DB) error {
return err
}
}
if err := p.Validate(tx); err != nil {
return err
}
@ -358,8 +359,11 @@ func (s *State) ProjectPut(
return nil, lookupErrorToStatus("project", err)
}
// Make sure we don't have a nil value
if err != nil {
// If a project is found, remove the basis
// ref to prevent update attempts
if project != nil {
p.Basis = nil
} else {
project = &Project{}
}

8
internal/server/singleprocess/state/target.go
View file

@ -394,8 +394,12 @@ func (s *State) TargetPut(
return nil, lookupErrorToStatus("target", err)
}
// Make sure we don't have a nil
if err != nil {
// If a target is found, remove the project
// ref to prevent update attempts
if target != nil {
t.Project = nil
} else {
// Otherwise, init target for the decode
target = &Target{}
}