From a2147ed27f90f6e6dc2a39473675e51531e63a75 Mon Sep 17 00:00:00 2001
From: Chris Roberts <croberts@hashicorp.com>
Date: Wed, 17 Nov 2021 14:45:42 -0800
Subject: [PATCH] Update basis ResourceId to match interface

---
 internal/core/basis.go   | 6 +++---
 internal/core/project.go | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal/core/basis.go b/internal/core/basis.go
index d5ba0f3bc..c3c9de3b8 100644
--- a/internal/core/basis.go
+++ b/internal/core/basis.go
@@ -415,7 +415,7 @@ func (b *Basis) LoadProject(popts ...ProjectOption) (p *Project, err error) {
 	p.Closer(func() error {
 		b.m.Lock()
 		defer b.m.Unlock()
-		delete(b.projects, p.ResourceId())
+		delete(b.projects, p.project.ResourceId)
 		delete(b.projects, p.Name())
 		return nil
 	})
@@ -494,11 +494,11 @@ func (b *Basis) SaveFull() (err error) {
 	for _, p := range b.projects {
 		b.logger.Trace("saving project",
 			"basis", b.ResourceId(),
-			"project", p.ResourceId())
+			"project", p.project.ResourceId)
 
 		if perr := p.SaveFull(); perr != nil {
 			b.logger.Trace("error while saving project",
-				"project", p.ResourceId(),
+				"project", p.project.ResourceId,
 				"error", err)
 
 			err = multierror.Append(err, perr)
diff --git a/internal/core/project.go b/internal/core/project.go
index 2ae88933e..a22b3a599 100644
--- a/internal/core/project.go
+++ b/internal/core/project.go
@@ -204,8 +204,8 @@ func (p *Project) Name() string {
 }
 
 // Resource ID for this project
-func (p *Project) ResourceId() string {
-	return p.project.ResourceId
+func (p *Project) ResourceId() (string, error) {
+	return p.project.ResourceId, nil
 }
 
 // Returns the job info if currently set
@@ -362,7 +362,7 @@ func (p *Project) Save() (err error) {
 	defer p.m.Unlock()
 
 	p.logger.Trace("saving project to db",
-		"project", p.ResourceId())
+		"project", p.project.ResourceId)
 
 	result, err := p.Client().UpsertProject(p.ctx,
 		&vagrant_server.UpsertProjectRequest{
@@ -371,7 +371,7 @@ func (p *Project) Save() (err error) {
 	)
 	if err != nil {
 		p.logger.Trace("failed to save project",
-			"project", p.ResourceId())
+			"project", p.project.ResourceId)
 	}
 
 	p.project = result.Project