Skip to content

Use new spaceUsage endpoint in place of deprecated spaceStatus #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
murrayju merged 2 commits into from
May 22, 2026
Merged

Use new spaceUsage endpoint in place of deprecated spaceStatus #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c2cbd5
Use new spaceUsage endpoint in place of deprecated spaceStatus
murrayju May 22, 2026
5c8cc5f
Rename common.FetchStatus to FetchUsage
murrayju May 22, 2026
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
121 changes: 119 additions & 2 deletions internal/api/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions internal/api/mock/mock_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/api/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 24 additions & 24 deletions internal/cmd/usage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ func buildUsageCmd(app *common.App) *cobra.Command {
return err
}

status, err := common.FetchStatus(cmd.Context(), client, projectID)
usage, err := common.FetchUsage(cmd.Context(), client, projectID)
if err != nil {
return err
}

switch {
case jsonOutput:
return util.SerializeToJSON(cmd.OutOrStdout(), status)
return util.SerializeToJSON(cmd.OutOrStdout(), usage)
case yamlOutput:
return util.SerializeToYAML(cmd.OutOrStdout(), status)
return util.SerializeToYAML(cmd.OutOrStdout(), usage)
default:
outputUsage(cmd, status)
outputUsage(cmd, usage)
return nil
}
},
Expand All @@ -59,32 +59,32 @@ func buildUsageCmd(app *common.App) *cobra.Command {
return cmd
}

func outputUsage(cmd *cobra.Command, status common.Status) {
computeHours := float64(status.ComputeMinutes) / 60
computeLimitHours := float64(status.ComputeLimitMinutes) / 60
computePercent := float64(status.ComputeMinutes) / float64(status.ComputeLimitMinutes) * 100
func outputUsage(cmd *cobra.Command, usage common.Usage) {
computeHours := float64(usage.ComputeMinutes) / 60
computeLimitHours := float64(usage.ComputeLimitMinutes) / 60
computePercent := float64(usage.ComputeMinutes) / float64(usage.ComputeLimitMinutes) * 100

storageMibInt := int(status.StorageMib)
storageMibInt := int(usage.StorageMib)
storageStr := common.FormatStorageSize(&storageMibInt)
storagePercent := float64(status.StorageMib) / float64(status.StorageLimitMib) * 100
storagePercent := float64(usage.StorageMib) / float64(usage.StorageLimitMib) * 100

// Build status breakdown (only non-zero counts, in consistent order)
type statusEntry struct {
name string
count int
}
entries := []statusEntry{
{"queued", status.Databases.Queued},
{"configuring", status.Databases.Configuring},
{"running", status.Databases.Running},
{"pausing", status.Databases.Pausing},
{"paused", status.Databases.Paused},
{"resuming", status.Databases.Resuming},
{"deleting", status.Databases.Deleting},
{"deleted", status.Databases.Deleted},
{"upgrading", status.Databases.Upgrading},
{"unstable", status.Databases.Unstable},
{"unknown", status.Databases.Unknown},
{"queued", usage.Databases.Queued},
{"configuring", usage.Databases.Configuring},
{"running", usage.Databases.Running},
{"pausing", usage.Databases.Pausing},
{"paused", usage.Databases.Paused},
{"resuming", usage.Databases.Resuming},
{"deleting", usage.Databases.Deleting},
{"deleted", usage.Databases.Deleted},
{"upgrading", usage.Databases.Upgrading},
{"unstable", usage.Databases.Unstable},
{"unknown", usage.Databases.Unknown},
}

var total int
Expand All @@ -96,7 +96,7 @@ func outputUsage(cmd *cobra.Command, status common.Status) {
}
}

cmd.Printf("Space: %s\n", status.SpaceID)
cmd.Printf("Space: %s\n", usage.SpaceID)
cmd.Printf("Compute: %g/%g hours (%s)\n", computeHours, computeLimitHours, formatPercent(computePercent))
cmd.Printf("Storage: %s/1TiB (%s)\n", storageStr, formatPercent(storagePercent))
if len(parts) > 0 {
Expand All @@ -106,8 +106,8 @@ func outputUsage(cmd *cobra.Command, status common.Status) {
}
// Show cost only when at least one field is non-zero. Free-tier users
// usually have zero cost, and "$0.00" adds noise.
costToDate := util.Deref(status.CostToDate)
estimatedTotalCost := util.Deref(status.EstimatedTotalCost)
costToDate := util.Deref(usage.CostToDate)
estimatedTotalCost := util.Deref(usage.EstimatedTotalCost)
if costToDate > 0 || estimatedTotalCost > 0 {
cmd.Printf("Cost: $%.2f so far this cycle ($%.2f estimated total)\n",
costToDate, estimatedTotalCost)
Expand Down
Loading