Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions internal/container/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,13 @@ func Status(ctx context.Context, rt runtime.Runtime, containers []config.Contain
ctx, cancel := context.WithTimeout(ctx, statusTimeout)
defer cancel()

output.EmitSpinnerStart(sink, "Fetching LocalStack status")

for _, c := range containers {
name := c.Name()
running, err := rt.IsRunning(ctx, name)
if err != nil {
output.EmitSpinnerStop(sink)
return fmt.Errorf("checking %s running: %w", name, err)
}
if !running {
output.EmitSpinnerStop(sink)
output.EmitError(sink, output.ErrorEvent{
Title: fmt.Sprintf("%s is not running", c.DisplayName()),
Actions: []output.ErrorAction{
Expand Down Expand Up @@ -59,23 +55,21 @@ func Status(ctx context.Context, rt runtime.Runtime, containers []config.Contain
var rows []emulator.Resource
switch c.Type {
case config.EmulatorAWS:
output.EmitSpinnerStart(sink, "Fetching LocalStack status")
if v, err := emulatorClient.FetchVersion(ctx, host); err != nil {
output.EmitSpinnerStop(sink)
output.EmitWarning(sink, fmt.Sprintf("Could not fetch version: %v", err))
} else {
version = v
}

var fetchErr error
rows, fetchErr = emulatorClient.FetchResources(ctx, host)
output.EmitSpinnerStop(sink)
if fetchErr != nil {
output.EmitSpinnerStop(sink)
return fetchErr
}
}

output.EmitSpinnerStop(sink)

output.EmitInstanceInfo(sink, output.InstanceInfoEvent{
EmulatorName: c.DisplayName(),
Version: version,
Expand Down