Scope --poll-state to bosh run-errand; simplify heartbeat output

Per reviewer feedback:
- Remove --poll-state from bosh task (keep it on bosh run-errand only)
- Remove task description from heartbeat output to reduce redundancy
  with the event log
- Keep elapsed time in heartbeat output for operator visibility

Heartbeat output is now:
  Task 42 | 16:15:14 | Task state: processing (1m31s elapsed)

Made-with: Cursor

Author: ay901246

cmd/cmd.go

@@ -137,11 +137,6 @@ func (c Cmd) Execute() (cmdErr error) {
 	case *TaskOpts:
 		eventsTaskReporter := boshuit.NewReporter(deps.UI, true)
 		plainTaskReporter := boshuit.NewReporter(deps.UI, false)
-		if opts.PollState != nil {
-			interval := time.Duration(*opts.PollState) * time.Second
-			eventsTaskReporter.EnableHeartbeat(interval)
-			plainTaskReporter.EnableHeartbeat(interval)
-		}
 		return NewTaskCmd(eventsTaskReporter, plainTaskReporter, c.director()).Run(*opts)
 
 	case *TasksOpts:

cmd/opts/opts.go

@@ -293,7 +293,6 @@ type TaskOpts struct {
 	Result bool `long:"result" description:"Track result log"`
 
 	All        bool `long:"all" short:"a" description:"Include all task types (ssh, logs, vms, etc)"`
-	PollState  *int `long:"poll-state" description:"Print task state every N seconds while waiting. Use '=' to specify interval" optional:"true" optional-value:"30"`
 	Deployment string
 
 	cmd

cmd/opts/opts_test.go

@@ -1283,13 +1283,6 @@ var _ = Describe("Opts", func() {
 			})
 		})
 
-		Describe("PollState", func() {
-			It("contains desired values", func() {
-				Expect(getStructTagForName("PollState", opts)).To(Equal(
-					`long:"poll-state" description:"Print task state every N seconds while waiting. Use '=' to specify interval" optional:"true" optional-value:"30"`,
-				))
-			})
-		})
 	})
 
 	Describe("TaskArgs", func() {

ui/task/reporter.go

@@ -141,9 +141,6 @@ func (r *ReporterImpl) TaskHeartbeat(id int, state string, description string, s
 		elapsed := time.Since(time.Unix(startedAt, 0)).Truncate(time.Second)
 		msg += fmt.Sprintf(" (%s elapsed)", elapsed)
 	}
-	if state != "queued" && description != "" {
-		msg += fmt.Sprintf(" (%s)", description)
-	}
 
 	r.printBlock(fmt.Sprintf("\nTask %d | %s | ", id, now.UTC().Format(boshuifmt.TimeHoursFmt)))
 	r.printBlock(msg)

ui/task/reporter_test.go

@@ -364,7 +364,7 @@ Task 101 done
 			combined := fmt.Sprintf("%v", fakeUI.Blocks)
 			Expect(combined).To(ContainSubstring("Task state: processing"))
 			Expect(combined).To(ContainSubstring("elapsed"))
-			Expect(combined).To(ContainSubstring("run errand"))
+			Expect(combined).NotTo(ContainSubstring("run errand"))
 		})
 
 		It("prints state without elapsed time when processing but startedAt is 0", func() {