From d802377b52b279811ba882b166c9f2bb008f2105 Mon Sep 17 00:00:00 2001
From: Chris Roberts <croberts@hashicorp.com>
Date: Tue, 28 Jun 2022 08:39:06 -0700
Subject: [PATCH] Include project resource id when loading from ref

---
 internal/core/project.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/internal/core/project.go b/internal/core/project.go
index 9fc46dd54..f2e6c67e7 100644
--- a/internal/core/project.go
+++ b/internal/core/project.go
@@ -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")