Don't check for 'found' in basis/project/target query results

This commit is contained in:
sophia 2021-09-08 13:09:30 -07:00 committed by Paul Hinze
parent bb336592ea
commit b30bbcb13a
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
8 changed files with 8 additions and 8 deletions

View File

@ -91,7 +91,7 @@ func (b *Basis) LoadProject(n string) (*Project, error) {
return nil, err
}
if !result.Found {
if result == nil {
return nil, NotFoundErr
}

View File

@ -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,

View File

@ -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)

View File

@ -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")

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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