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

Clean up types to match interface

Browse Source
This commit is contained in:
Chris Roberts 2021-05-25 13:51:42 -07:00 committed by Paul Hinze
parent d74d7376e3
commit af409b3f4d
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/core/project.go
View File

@ -120,7 +120,7 @@ func (p *Project) JobInfo() *component.JobInfo {
return p.jobInfo
}
func (p *Project) Target(nameOrId string) (*Target, error) {
func (p *Project) Target(nameOrId string) (core.Target, error) {
if t, ok := p.targets[nameOrId]; ok {
return t, nil
}

12
internal/core/target.go
View File

@ -232,8 +232,10 @@ type TargetOption func(*Target) error
func WithTargetName(name string) TargetOption {
return func(t *Target) (err error) {
if ex := t.project.Target(name); ex != nil {
t.target = ex.target
if ex, _ := t.project.Target(name); ex != nil {
if et, ok := ex.(*Target); ok {
t.target = et.target
}
return
}
for _, target := range t.project.targets {
@ -262,8 +264,10 @@ func WithTargetRef(r *vagrant_plugin_sdk.Ref_Target) TargetOption {
}
var target *vagrant_server.Target
if ex := t.project.Target(r.Name); ex != nil {
t.target = ex.target
if ex, _ := t.project.Target(r.Name); ex != nil {
if et, ok := ex.(*Target); ok {
t.target = et.target
}
return
}
result, err := t.Client().FindTarget(t.ctx,