diff --git a/internal/cmd/status.go b/internal/cmd/status.go index ccc2090..83701ad 100644 --- a/internal/cmd/status.go +++ b/internal/cmd/status.go @@ -96,7 +96,7 @@ func outputStatus(cmd *cobra.Command, status common.Status) { } } - cmd.Println("Space Usage") + cmd.Printf("Space: %s\n", status.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 { diff --git a/internal/cmd/status_test.go b/internal/cmd/status_test.go index 8bd02eb..76ead37 100644 --- a/internal/cmd/status_test.go +++ b/internal/cmd/status_test.go @@ -120,7 +120,7 @@ func TestStatusCmd(t *testing.T) { name: "text output", args: []string{"status"}, setup: successSetup, - wantStdout: `Space Usage + wantStdout: `Space: test-project Compute: 2/10 hours (20%) Storage: 512MiB/1TiB (0%) Databases: 2 (1 running, 1 paused) @@ -138,7 +138,8 @@ Databases: 2 (1 running, 1 paused) "databases": { "running": 1, "paused": 1 - } + }, + "space_id": "test-project" } `, }, @@ -151,6 +152,7 @@ compute_minutes: 120 databases: paused: 1 running: 1 +space_id: test-project storage_limit_mib: 1.048576e+06 storage_mib: 512 `, @@ -159,7 +161,7 @@ storage_mib: 512 name: "usage alias", args: []string{"usage"}, setup: successSetup, - wantStdout: `Space Usage + wantStdout: `Space: test-project Compute: 2/10 hours (20%) Storage: 512MiB/1TiB (0%) Databases: 2 (1 running, 1 paused) @@ -188,7 +190,7 @@ Databases: 2 (1 running, 1 paused) JSON200: &databases, }, nil) }, - wantStdout: `Space Usage + wantStdout: `Space: test-project Compute: 2/10 hours (20%) Storage: 512MiB/1TiB (0%) Databases: 1 (1 running) @@ -218,7 +220,7 @@ Cost: $12.34 so far this cycle ($27.50 estimated total) JSON200: &databases, }, nil) }, - wantStdout: `Space Usage + wantStdout: `Space: test-project Compute: 2/10 hours (20%) Storage: 512MiB/1TiB (0%) Databases: 1 (1 running) diff --git a/internal/common/status.go b/internal/common/status.go index 74526b7..af74727 100644 --- a/internal/common/status.go +++ b/internal/common/status.go @@ -38,6 +38,7 @@ type Status struct { EstimatedTotalCost *float64 `json:"estimated_total_cost,omitempty"` BillingPeriodStart *time.Time `json:"billing_period_start,omitempty"` BillingPeriodEnd *time.Time `json:"billing_period_end,omitempty"` + SpaceID string `json:"space_id"` } // FetchStatus fetches space usage and database counts from the API. @@ -120,5 +121,6 @@ func FetchStatus(ctx context.Context, client api.ClientWithResponsesInterface, p EstimatedTotalCost: spaceStatus.EstimatedTotalCost, BillingPeriodStart: spaceStatus.BillingPeriodStart, BillingPeriodEnd: spaceStatus.BillingPeriodEnd, + SpaceID: projectID, }, nil }