Don't check for 'found' in basis/project/target query results
This commit is contained in:
parent
bb336592ea
commit
b30bbcb13a
@ -91,7 +91,7 @@ func (b *Basis) LoadProject(n string) (*Project, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if !result.Found {
|
||||
if result == nil {
|
||||
return nil, NotFoundErr
|
||||
}
|
||||
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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)
|
||||
|
||||
|
||||
@ -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")
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user