beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove automatic target initialization, update caching

Browse Source
This commit is contained in:
Chris Roberts 2022-06-15 10:47:17 -07:00
parent e03058d9e8
commit ab34fddbc4
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
internal/core/project.go
View File

@ -477,29 +477,24 @@ func (p *Project) LoadTarget(topts ...TargetOption) (t *Target, err error) {
return nil, err
}
// Lookup target in cached list by name
if c, ok := p.targets[t.target.Name]; ok {
if c.vagrantfile != nil {
return c, nil
}
return c, nil
}
// Lookup target in cached list by resource id
if c, ok := p.targets[t.target.ResourceId]; ok {
// If the vagrantfile hasn't been set on the cached
// value, re-apply the options before returning
if c.vagrantfile == nil {
// If it hasn't, re-apply the opts before returning
for _, opt := range topts {
if oerr := opt(c); oerr != nil {
err = multierror.Append(err, oerr)
}
}
if err != nil {
return nil, err
}
}
return c, nil
}
// Only store cache the local target if the vagrantfile
// has been set
if t.vagrantfile != nil {
// Add the target to target list in project
p.targets[t.target.ResourceId] = t
p.targets[t.target.Name] = t
}
// If this is the first time through, re-init the target
if err = t.init(); err != nil {
return
@ -512,10 +507,6 @@ func (p *Project) LoadTarget(topts ...TargetOption) (t *Target, err error) {
}
}
// Add the target to target list in project
p.targets[t.target.ResourceId] = t
p.targets[t.target.Name] = t
// Update the logger name based on the level
if t.logger.IsTrace() {
t.logger = t.logger.Named("target")
@ -561,11 +552,6 @@ func (p *Project) Run(ctx context.Context, task *vagrant_server.Task) (err error
"project", p,
"task", task)
// Intialize targets
if err = p.InitTargets(); err != nil {
return err
}
cmd, err := p.basis.component(
ctx, component.CommandType, task.Component.Name)
if err != nil {