Stream async job warnings as they arrive for delete commands by johha · Pull Request #3859 · cloudfoundry/cli

johha · 2026-09-03T10:42:12Z

Description of the Change

cf delete, cf delete-org, and cf delete-space kick off an asynchronous Cloud Controller job and then poll it to completion. Previously the CLI aggregated every warning returned across all poll ticks and dumped them at the very end, after the job reached a terminal state. Because Cloud Controller re-sends the same warnings on every poll, a single warning could be printed dozens of times.

This PR migrates those three commands from the aggregated CloudControllerClient.PollJob path to a streaming poll: the actor returns a chan PollJobEvent (via PollJobToEventStream) that command/v7/shared.WaitForResult drains, printing warnings as they arrive instead of at the end.

Key changes:

Streaming actors - DeleteApplicationByNameAndSpace, DeleteOrganization, and DeleteSpace now return (chan PollJobEvent, Warnings, error). For cf delete -r, the app-delete job and each route-delete job are merged into a single stream in the actor, so the whole operation streams through one channel.
Run-scoped warning dedup - WaitForResult prints each distinct warning at most once per operation, collapsing the tick-by-tick repeats (including warnings that interleave across ticks).
The "Waiting for the operation to complete" banner now ends with a newline so streamed warnings and progress dots start on their own line.

Example: `cf delete-org` against a job that returns warnings on every poll

Before (warnings aggregated and repeated per poll tick):

$ cf delete-org my-org -f
Deleting org my-org as admin...
Deletion of service instance my-db is in progress.
Deletion of service instance my-db is in progress.
Endpoint deprecated: use the /v3 API instead.
Deletion of service instance my-db is in progress.
Endpoint deprecated: use the /v3 API instead.
... (repeats per poll tick for the same few warnings) ...
OK

After (each distinct warning shown once, streamed live with progress dots):

$ cf delete-org my-org -f
Deleting org my-org as admin...
Waiting for the operation to complete
Deletion of service instance my-db is in progress.
.Endpoint deprecated: use the /v3 API instead.
....Service broker returned a warning: quota not fully reclaimed.
.....

OK

cf delete APP -r (delete app + mapped routes) and cf delete-space behave the same way - warnings from the app job and each route/space job stream through as the jobs progress.

Why Is This PR Valuable?

Users deleting orgs, spaces, or apps get feedback while the operation runs rather than a wall of duplicated text at the end. Warnings that Cloud Controller emits mid-operation (progress hints, content warnings) now surface promptly and legibly - each distinct message once - instead of being buffered until the job finishes or the poll window times out.

This is part of the ongoing effort to make recursive/async delete operations more intuitive (cloudfoundry/cloud_controller_ng#3589). The corresponding Cloud Controller work that emits these async-delete warnings is landing on the server side; this PR is the CLI half that surfaces them well.

Applicable Issues

Related: Make recursive delete operations more intuitive cloud_controller_ng#3589 - Make recursive delete operations more intuitive

How Urgent Is The Change?

Not urgent

Other Relevant Parties

None.

This PR was drafted with the help of Claude (Opus).

Migrate delete, delete-org, and delete-space from aggregated PollJob to a streaming job poll (PollJobToEventStream -> WaitForResult), so warnings print live instead of dumped at the end. Dedupe distinct warnings to at most once per operation.

johha · 2026-09-03T10:59:07Z

Backport for v8: #3860

prkalle · 2026-09-23T04:41:03Z

@johha I noticed the integration tests are currently failing. Could you take a look at fixing those while I review the rest of the PR?

prkalle · 2026-09-22T19:14:30Z


 	if waitForCompletion {
-		fmt.Fprint(ui.Writer(), "Waiting for the operation to complete")
+		fmt.Fprintln(ui.Writer(), "Waiting for the operation to complete")


This newline moves the progress dots onto their own line, and WaitForResult is shared by 14 commands — the 3 delete commands added here plus 11 pre-existing service commands (bind-service, unbind-service, bind-route-service, unbind-route-service, create-service, update-service, upgrade-service, delete-service, create-service-key, delete-service-key, cleanup-outdated-service-bindings).

The unit tests were correctly updated for all of them:

-Say(`Waiting for the operation to complete\.\.\.\n`), +Say(`Waiting for the operation to complete\n\.\.\.`),

But the identical assertions in integration/v7/isolated/ were not and this PR touches no files under integration/. These 11 assertions expect dots immediately after complete, which no longer holds:

Worth calling out in the PR description as well: the change alters output for 11 service commands, not only the three delete commands the title describes. Anyone parsing cf bind-service --wait output is affected.

Fixed. Updated all affected files under integration/v7/isolated/ with the same regex adjustment already applied to the unit tests.

Update integration/v7/isolated/ banner regex to match new newline-before-dots output. Restore two-phase DeleteRoute: issue all calls first, then poll, so CC can process them concurrently as before.

johha · 2026-09-23T13:38:46Z

@johha I noticed the integration tests are currently failing. Could you take a look at fixing those while I review the rest of the PR?

Thanks for the review @prkalle. The integration tests are skipped now. The CVE job seems to fail for almost all jobs. Also addressed all findings.

Also adjust the v8 PR #3860

prkalle

Thanks for making these changes, @johha!

I re-ran the integration tests in CI and noticed a few failures. I've also left a couple of comments on the code for you to review.

(Note: You can ignore the CVE-related CI failures, I will handle fixing those in a separate PR.)

prkalle · 2026-09-24T04:32:03Z

 					Say(`Updating service instance %s in org %s / space %s as %s\.\.\.\n`, serviceInstanceName, orgName, spaceName, username),
 					Say(`\n`),
-					Say(`Update of service instance %s complete\.\n`, serviceInstanceName),
+					Say(`Update of service instance %s complete\n\.\n`, serviceInstanceName),


All 11 banner assertions look right now. But the replace also caught Update of service instance X complete. — that's the command's final success line (update_service_command.go:74), not the banner, and this PR doesn't change it. It should stay complete\.\n.

Three sites here: L186, L210, L336. L186 and L210 don't even pass --wait, so the banner never appears in them.

Suggested change

Say(`Update of service instance %s complete\n\.\n`, serviceInstanceName),

Say(`Update of service instance %s complete\.\n`, serviceInstanceName),

Same slip in upgrade_service_command_test.go — commented there. Integration tests need a live foundation, so unit CI won't catch either.

prkalle · 2026-09-24T04:32:03Z

+						Say(`Waiting for the operation to complete\n\.+`),
 						Say(`\n`),
-						Say(`Upgrade of service instance %s complete\.\n`, serviceInstanceName),
+						Say(`Upgrade of service instance %s complete\n\.\n`, serviceInstanceName),


Same collateral edit as in update_service_command_test.go (see the comment there for the full explanation).

Upgrade of service instance X complete. is the terminal success message, emitted at command/v7/upgrade_service_command.go:65, and is unaffected by this PR. The banner assertion two lines above is correct; this one should go back to the original:

Suggested change

Say(`Upgrade of service instance %s complete\n\.\n`, serviceInstanceName),

Say(`Upgrade of service instance %s complete\.\n`, serviceInstanceName),

prkalle · 2026-09-24T04:32:03Z

+		if deleteRoutes {
+			type routeJob struct {
+				jobURL   ccv3.JobURL
+				warnings Warnings


Suggestion: routeJob.warnings is set but never read, since those warnings are already streamed on the previous line. routeJob can collapse to just the job URL:

johha mentioned this pull request Sep 3, 2026

Stream async job warnings as they arrive for delete commands #3860

Open

prkalle self-requested a review September 22, 2026 21:33

prkalle added the safe-to-test label Sep 22, 2026

prkalle reviewed Sep 23, 2026

View reviewed changes

Fix integration tests and route-delete concurrency

777b6cb

Update integration/v7/isolated/ banner regex to match new newline-before-dots output. Restore two-phase DeleteRoute: issue all calls first, then poll, so CC can process them concurrently as before.

github-actions Bot removed the safe-to-test label Sep 23, 2026

prkalle added the safe-to-test label Sep 23, 2026

prkalle reviewed Sep 24, 2026

View reviewed changes

Navigation Menu

Stream async job warnings as they arrive for delete commands - #3859

Stream async job warnings as they arrive for delete commands#3859
johha wants to merge 2 commits into
cloudfoundry:mainfrom
sap-contributions:stream-job-warnings

johha commented Sep 3, 2026

Uh oh!

johha commented Sep 3, 2026

Uh oh!

prkalle commented Sep 23, 2026

Uh oh!

prkalle Sep 22, 2026

Uh oh!

johha Sep 23, 2026

Uh oh!

Uh oh!

johha commented Sep 23, 2026 •

edited

Loading

Uh oh!

prkalle left a comment

Uh oh!

prkalle Sep 24, 2026

Uh oh!

prkalle Sep 24, 2026

Uh oh!

prkalle Sep 24, 2026

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	Say(`Update of service instance %s complete\n\.\n`, serviceInstanceName),
	Say(`Update of service instance %s complete\.\n`, serviceInstanceName),

	Say(`Upgrade of service instance %s complete\n\.\n`, serviceInstanceName),
	Say(`Upgrade of service instance %s complete\.\n`, serviceInstanceName),

Conversation

johha commented Sep 3, 2026

Description of the Change

Example: cf delete-org against a job that returns warnings on every poll

Why Is This PR Valuable?

Applicable Issues

How Urgent Is The Change?

Other Relevant Parties

Uh oh!

johha commented Sep 3, 2026

Uh oh!

prkalle commented Sep 23, 2026

Uh oh!

prkalle Sep 22, 2026

Choose a reason for hiding this comment

Uh oh!

johha Sep 23, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

johha commented Sep 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

prkalle left a comment

Choose a reason for hiding this comment

Uh oh!

prkalle Sep 24, 2026

Choose a reason for hiding this comment

Uh oh!

prkalle Sep 24, 2026

Choose a reason for hiding this comment

Uh oh!

prkalle Sep 24, 2026

Choose a reason for hiding this comment

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Example: `cf delete-org` against a job that returns warnings on every poll

johha commented Sep 23, 2026 •

edited

Loading