Skip to content

Commit

Permalink
fix(lxd): Select server based on name from result (fixes canonical#151)
Browse files Browse the repository at this point in the history
(cherry picked from commit 9035588)
  • Loading branch information
thp-canonical authored and dmitry-lyfar committed Jun 11, 2024
1 parent 3af227f commit 3f49029
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions spread/lxd.go
Original file line number Diff line number Diff line change
Expand Up @@ -476,13 +476,12 @@ func (p *lxdProvider) serverJSON(name string) (*lxdServerJSON, error) {

debugf("lxd list output: %# v\n", sjsons)

if len(sjsons) == 0 {
return nil, &lxdNoServerError{name}
}
if sjsons[0].Name != name {
return nil, fmt.Errorf("lxd returned invalid JSON listing for %q: %s", name, outputErr(output, nil))
for _, server := range sjsons {
if server.Name == name {
return server, nil
}
}
return sjsons[0], nil
return nil, &lxdNoServerError{name}
}

func (p *lxdProvider) tuneSSH(name string) error {
Expand Down

0 comments on commit 3f49029

Please sign in to comment.