Skip to content

Commit

Permalink
[m31ctl] bail out with return code != 0 on wait timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
@notandy
notandy committed Jan 3, 2025
1 parent 8f28e37 commit e6ffd7e
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions internal/client/datacenter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"errors"
"fmt"

"github.com/apex/log"
"github.com/go-openapi/strfmt"

"github.com/sapcc/andromeda/client/datacenters"
Expand Down Expand Up @@ -89,7 +88,7 @@ func (*DatacenterCreate) Execute(_ []string) error {
return err
}
if err = waitForActiveDatacenter(resp.Payload.Datacenter.ID, false); err != nil {
log.WithError(err).Error("Failed to wait for datacenter to be active")
return fmt.Errorf("failed to wait for datacenter %s to be active", resp.Payload.Datacenter.ID)
}
return WriteTable(resp.GetPayload().Datacenter)
}
Expand All @@ -114,7 +113,8 @@ func (*DatacenterDelete) Execute(_ []string) error {
return err
}
if err := waitForActiveDatacenter(DatacenterOptions.DatacenterDelete.Positional.UUID, true); err != nil {
log.WithError(err).Error("Failed to wait for datacenter to be deleted")
return fmt.Errorf("failed to wait for datacenter %s to be active",
DatacenterOptions.DatacenterDelete.Positional.UUID)
}
return nil
}
Expand Down
5 changes: 2 additions & 3 deletions internal/client/domain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"errors"
"fmt"

"github.com/apex/log"
"github.com/go-openapi/strfmt"
"github.com/go-openapi/swag"

Expand Down Expand Up @@ -130,7 +129,7 @@ func (*DomainDelete) Execute(_ []string) error {
return err
}
if err := waitForActiveDomain(DomainOptions.DomainDelete.Positional.UUID, true); err != nil {
log.WithError(err).Error("Failed to wait for domain to be deleted")
return fmt.Errorf("failed to wait for domain %s to be deleted", DomainOptions.DomainDelete.Positional.UUID)
}
return nil
}
Expand Down Expand Up @@ -176,7 +175,7 @@ func (*DomainSet) Execute(_ []string) error {
return err
}
if err = waitForActiveDomain(DomainOptions.DomainSet.Positional.UUID, false); err != nil {
log.WithError(err).Error("Failed to wait for domain to be active")
return fmt.Errorf("failed to wait for domain %s to be active", DomainOptions.DomainSet.Positional.UUID)
}
return WriteTable(resp.GetPayload().Domain)
}
Expand Down
6 changes: 3 additions & 3 deletions internal/client/geomap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"errors"
"fmt"

"github.com/apex/log"
"github.com/go-openapi/strfmt"

"github.com/sapcc/andromeda/client/geographic_maps"
Expand Down Expand Up @@ -92,7 +91,7 @@ func (*GeomapCreate) Execute(_ []string) error {
return err
}
if err = waitForActiveGeomap(resp.Payload.Geomap.ID, false); err != nil {
log.WithError(err).Error("Failed to wait for geomap to be active")
return fmt.Errorf("failed to wait for geomap %s to be active", resp.Payload.Geomap.ID)
}
return WriteTable(resp.GetPayload().Geomap)
}
Expand All @@ -117,7 +116,8 @@ func (*GeomapDelete) Execute(_ []string) error {
return err
}
if err := waitForActiveGeomap(GeomapOptions.GeomapDelete.Positional.UUID, true); err != nil {
log.WithError(err).Error("Failed to wait for geomap to be deleted")
return fmt.Errorf("failed to wait for geomap %s to be deleted",
GeomapOptions.GeomapDelete.Positional.UUID)
}
return nil
}
Expand Down
9 changes: 5 additions & 4 deletions internal/client/member.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"errors"
"fmt"

"github.com/apex/log"
"github.com/go-openapi/strfmt"

"github.com/sapcc/andromeda/client/members"
Expand Down Expand Up @@ -101,7 +100,7 @@ func (*MemberCreate) Execute(_ []string) error {
return err
}
if err = waitForActiveMember(resp.GetPayload().Member.ID, false); err != nil {
log.WithError(err).Error("Failed to wait for member to be active")
return fmt.Errorf("failed to wait for member %s to be active", resp.GetPayload().Member.ID)
}
return WriteTable(resp.GetPayload().Member)
}
Expand All @@ -126,7 +125,8 @@ func (*MemberDelete) Execute(_ []string) error {
return err
}
if err := waitForActiveMember(MemberOptions.MemberDelete.PositionalMemberDelete.UUID, true); err != nil {
log.WithError(err).Error("Failed to wait for member to be deleted")
return fmt.Errorf("failed to wait for member %s to be deleted",
MemberOptions.MemberDelete.PositionalMemberDelete.UUID)
}
return nil
}
Expand Down Expand Up @@ -159,7 +159,8 @@ func (*MemberSet) Execute(_ []string) error {
return err
}
if err = waitForActiveMember(MemberOptions.MemberSet.PositionalMemberSet.UUID, false); err != nil {
log.WithError(err).Error("Failed to wait for member to be active")
return fmt.Errorf("failed to wait for member %s to be active",
MemberOptions.MemberSet.PositionalMemberSet.UUID)
}
return WriteTable(resp.GetPayload().Member)
}
Expand Down
9 changes: 5 additions & 4 deletions internal/client/monitor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"errors"
"fmt"

"github.com/apex/log"
"github.com/go-openapi/strfmt"
"github.com/go-openapi/swag"

Expand Down Expand Up @@ -107,7 +106,7 @@ func (*MonitorCreate) Execute(_ []string) error {
return err
}
if err = waitForActiveMonitor(resp.Payload.Monitor.ID, false); err != nil {
log.WithError(err).Error("Failed to wait for monitor to be active")
return fmt.Errorf("failed to wait for monitor %s to be active", resp.Payload.Monitor.ID)
}
return WriteTable(resp.GetPayload().Monitor)
}
Expand All @@ -132,7 +131,8 @@ func (*MonitorDelete) Execute(_ []string) error {
return err
}
if err := waitForActiveMonitor(MonitorOptions.MonitorDelete.Positional.UUID, true); err != nil {
log.WithError(err).Error("Failed to wait for monitor to be deleted")
return fmt.Errorf("failed to wait for monitor %s to be deleted",
MonitorOptions.MonitorDelete.Positional.UUID)
}
return nil
}
Expand Down Expand Up @@ -162,7 +162,8 @@ func (*MonitorSet) Execute(_ []string) error {
return err
}
if err = waitForActiveMonitor(MonitorOptions.MonitorSet.Positional.UUID, false); err != nil {
log.WithError(err).Error("Failed to wait for monitor to be active")
return fmt.Errorf("failed to wait for monitor %s to be active",
MonitorOptions.MonitorSet.Positional.UUID)
}
return WriteTable(resp.GetPayload().Monitor)
}
Expand Down
5 changes: 2 additions & 3 deletions internal/client/pool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"errors"
"fmt"

"github.com/apex/log"
"github.com/go-openapi/strfmt"

"github.com/sapcc/andromeda/client/pools"
Expand Down Expand Up @@ -83,7 +82,7 @@ func (*PoolCreate) Execute(_ []string) error {
return err
}
if err = waitForActivePool(resp.Payload.Pool.ID, false); err != nil {
log.WithError(err).Error("Failed to wait for pool to be active")
return fmt.Errorf("failed to wait for pool %s to be active", resp.Payload.Pool.ID)
}
return WriteTable(resp.GetPayload().Pool)
}
Expand All @@ -108,7 +107,7 @@ func (*PoolDelete) Execute(_ []string) error {
return err
}
if err := waitForActivePool(PoolOptions.PoolDelete.Positional.UUID, true); err != nil {
log.WithError(err).Error("Failed to wait for pool to be deleted")
return fmt.Errorf("failed to wait for pool %s to be deleted", PoolOptions.PoolDelete.Positional.UUID)
}
return nil
}
Expand Down

0 comments on commit e6ffd7e

Please sign in to comment.