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

Include project resource id when loading from ref

Browse Source
This commit is contained in:
Chris Roberts 2022-06-28 08:39:06 -07:00
parent b2aafa2469
commit d802377b52
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/core/project.go
View File

@ -927,9 +927,10 @@ func WithProjectRef(r *vagrant_plugin_sdk.Ref_Project) ProjectOption {
result, err := p.Client().FindProject(p.ctx,
&vagrant_server.FindProjectRequest{
Project: &vagrant_server.Project{
Basis: r.Basis,
Name: r.Name,
Path: r.Path,
Basis: r.Basis,
Name: r.Name,
Path: r.Path,
ResourceId: r.ResourceId,
},
},
)
@ -953,7 +954,7 @@ func WithProjectRef(r *vagrant_plugin_sdk.Ref_Project) ProjectOption {
}
// Before we init, validate basis is consistent
if project.Basis.ResourceId != r.Basis.ResourceId {
if r.Basis != nil && project.Basis.ResourceId != r.Basis.ResourceId {
p.logger.Error("invalid basis for project", "request-basis", r.Basis,
"project-basis", project.Basis)
return errors.New("project basis configuration is invalid")