From b30bbcb13a4220efd7027f97611f61977562c4e0 Mon Sep 17 00:00:00 2001
From: sophia <scastellarin95@gmail.com>
Date: Wed, 8 Sep 2021 13:09:30 -0700
Subject: [PATCH] Don't check for 'found' in basis/project/target query results

---
 internal/client/basis.go                         | 2 +-
 internal/client/project.go                       | 2 +-
 internal/core/basis.go                           | 2 +-
 internal/core/project.go                         | 2 +-
 internal/core/target.go                          | 2 +-
 internal/server/singleprocess/service_basis.go   | 2 +-
 internal/server/singleprocess/service_project.go | 2 +-
 internal/server/singleprocess/service_target.go  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/internal/client/basis.go b/internal/client/basis.go
index 9eafce002..f231a3d9b 100644
--- a/internal/client/basis.go
+++ b/internal/client/basis.go
@@ -91,7 +91,7 @@ func (b *Basis) LoadProject(n string) (*Project, error) {
 		return nil, err
 	}
 
-	if !result.Found {
+	if result == nil {
 		return nil, NotFoundErr
 	}
 
diff --git a/internal/client/project.go b/internal/client/project.go
index 5cd511477..74b34100b 100644
--- a/internal/client/project.go
+++ b/internal/client/project.go
@@ -113,7 +113,7 @@ func (p *Project) LoadTarget(n string) (*Target, error) {
 	}
 
 	// If the target exists, load and return
-	if result.Found {
+	if result != nil {
 		return &Target{
 			client:  p.client,
 			ctx:     p.ctx,
diff --git a/internal/core/basis.go b/internal/core/basis.go
index d52525a84..374520c05 100644
--- a/internal/core/basis.go
+++ b/internal/core/basis.go
@@ -762,7 +762,7 @@ func WithBasisResourceId(rid string) BasisOption {
 		if err != nil {
 			return
 		}
-		if !result.Found {
+		if result == nil {
 			b.logger.Error("failed to locate basis during setup",
 				"resource-id", rid)
 
diff --git a/internal/core/project.go b/internal/core/project.go
index a5e392079..a6347686d 100644
--- a/internal/core/project.go
+++ b/internal/core/project.go
@@ -570,7 +570,7 @@ func WithProjectName(name string) ProjectOption {
 		if err != nil {
 			return
 		}
-		if !result.Found {
+		if result == nil {
 			p.logger.Error("failed to locate project during setup", "project", name,
 				"basis", p.basis.Ref())
 			return errors.New("failed to load project")
diff --git a/internal/core/target.go b/internal/core/target.go
index 2fe119113..b29f8397b 100644
--- a/internal/core/target.go
+++ b/internal/core/target.go
@@ -355,7 +355,7 @@ func WithTargetRef(r *vagrant_plugin_sdk.Ref_Target) TargetOption {
 		if err != nil {
 			return err
 		}
-		if result.Found {
+		if result != nil {
 			target = result.Target
 		} else {
 			var result *vagrant_server.UpsertTargetResponse
diff --git a/internal/server/singleprocess/service_basis.go b/internal/server/singleprocess/service_basis.go
index b90ade060..aa99f2fe7 100644
--- a/internal/server/singleprocess/service_basis.go
+++ b/internal/server/singleprocess/service_basis.go
@@ -43,7 +43,7 @@ func (s *service) FindBasis(
 		return nil, err
 	}
 
-	return &vagrant_server.FindBasisResponse{Basis: result, Found: true}, nil
+	return &vagrant_server.FindBasisResponse{Basis: result}, nil
 }
 
 // TODO: test
diff --git a/internal/server/singleprocess/service_project.go b/internal/server/singleprocess/service_project.go
index 58603b3c2..637637cc7 100644
--- a/internal/server/singleprocess/service_project.go
+++ b/internal/server/singleprocess/service_project.go
@@ -42,7 +42,7 @@ func (s *service) FindProject(
 	if err != nil {
 		return nil, err
 	}
-	return &vagrant_server.FindProjectResponse{Project: result, Found: true}, nil
+	return &vagrant_server.FindProjectResponse{Project: result}, nil
 }
 
 // TODO: test
diff --git a/internal/server/singleprocess/service_target.go b/internal/server/singleprocess/service_target.go
index 30615e61c..4f42ea372 100644
--- a/internal/server/singleprocess/service_target.go
+++ b/internal/server/singleprocess/service_target.go
@@ -50,7 +50,7 @@ func (s *service) FindTarget(
 	if err != nil {
 		return nil, err
 	}
-	return &vagrant_server.FindTargetResponse{Target: result, Found: true}, nil
+	return &vagrant_server.FindTargetResponse{Target: result}, nil
 }
 
 // TODO: test