feat(cli): add daily_cost to coder ls

ammario · ammario · commit 4bb513e2b3ad · 2023-08-18T19:08:24.000Z
diff --git a/cli/list.go b/cli/list.go
@@ -30,6 +30,7 @@ type workspaceListRow struct {
 	Outdated      bool   `json:"-" table:"outdated"`
 	StartsAt      string `json:"-" table:"starts at"`
 	StopsAfter    string `json:"-" table:"stops after"`
+	DailyCost     string `json:"-" table:"daily cost"`
 }
 
 func workspaceListRowFromWorkspace(now time.Time, usersByID map[uuid.UUID]codersdk.User, workspace codersdk.Workspace) workspaceListRow {
@@ -68,6 +69,7 @@ func workspaceListRowFromWorkspace(now time.Time, usersByID map[uuid.UUID]coders
 		Outdated:      workspace.Outdated,
 		StartsAt:      autostartDisplay,
 		StopsAfter:    autostopDisplay,
+		DailyCost:     strconv.Itoa(int(workspace.LatestBuild.DailyCost)),
 	}
 }
 
@@ -78,7 +80,19 @@ func (r *RootCmd) list() *clibase.Cmd {
 		searchQuery       string
 		displayWorkspaces []workspaceListRow
 		formatter         = cliui.NewOutputFormatter(
-			cliui.TableFormat([]workspaceListRow{}, nil),
+			cliui.TableFormat(
+				[]workspaceListRow{},
+				[]string{
+					"workspace",
+					"template",
+					"status",
+					"healthy",
+					"last built",
+					"outdated",
+					"starts at",
+					"stops after",
+				},
+			),
 			cliui.JSONFormat(),
 		)
 	)
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -404,7 +404,7 @@ func (p *Server) acquireJob(ctx context.Context) {
 		runner.Options{
 			Updater:             p,
 			QuotaCommitter:      p,
-			Logger:              p.opts.Logger,
+			Logger:              p.opts.Logger.Named("runner"),
 			Filesystem:          p.opts.Filesystem,
 			WorkDirectory:       p.opts.WorkDirectory,
 			Provisioner:         provisioner,
diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go
@@ -964,6 +964,9 @@ func (r *Runner) buildWorkspace(ctx context.Context, stage string, req *sdkproto
 }
 
 func (r *Runner) commitQuota(ctx context.Context, resources []*sdkproto.Resource) *proto.FailedJob {
+	r.logger.Debug(ctx, "committing quota",
+		slog.F("resources", resources),
+	)
 	cost := sumDailyCost(resources)
 	if cost == 0 {
 		return nil

Original file line number	Diff line number	Diff line change
`@@ -964,6 +964,9 @@ func (r Runner) buildWorkspace(ctx context.Context, stage string, req sdkproto`
`964`	`964`	`}`
`965`	`965`
`966`	`966`	`func (r Runner) commitQuota(ctx context.Context, resources []sdkproto.Resource) *proto.FailedJob {`
	`967`	`+ r.logger.Debug(ctx, "committing quota",`
	`968`	`+ slog.F("resources", resources),`
	`969`	`+ )`
`967`	`970`	`cost := sumDailyCost(resources)`
`968`	`971`	`if cost == 0 {`
`969`	`972`	`return nil`