V8 Backport: Show job GUID in service command progress hints

actor/v7action/job.go

@@ -18,6 +18,7 @@ type PollJobEvent struct {
 	State    JobState
 	Err      error
 	Warnings Warnings
+	JobGUID  string
 }
 
 func (actor Actor) PollUploadBuildpackJob(jobURL ccv3.JobURL) (Warnings, error) {
@@ -39,6 +40,7 @@ func (actor Actor) PollJobToEventStream(jobURL ccv3.JobURL) chan PollJobEvent {
 				State:    JobState(event.State),
 				Err:      event.Err,
 				Warnings: Warnings(event.Warnings),
+				JobGUID:  event.JobGUID,
 			}
 		}
 		close(output)

actor/v7action/job_test.go

@@ -81,16 +81,19 @@ var _ = Describe("Job Actions", func() {
 						State:    constant.JobProcessing,
 						Err:      nil,
 						Warnings: ccv3.Warnings{"foo"},
+						JobGUID:  "job-guid",
 					}
 					fakeStream <- ccv3.PollJobEvent{
 						State:    constant.JobPolling,
 						Err:      nil,
 						Warnings: ccv3.Warnings{"bar"},
+						JobGUID:  "job-guid",
 					}
 					fakeStream <- ccv3.PollJobEvent{
 						State:    constant.JobFailed,
 						Err:      errors.New("bad thing"),
 						Warnings: ccv3.Warnings{"baz"},
+						JobGUID:  "job-guid",
 					}
 					close(fakeStream)
 				}()
@@ -105,16 +108,19 @@ var _ = Describe("Job Actions", func() {
 				State:    JobProcessing,
 				Err:      nil,
 				Warnings: Warnings{"foo"},
+				JobGUID:  "job-guid",
 			})))
 			Eventually(stream).Should(Receive(Equal(PollJobEvent{
 				State:    JobPolling,
 				Err:      nil,
 				Warnings: Warnings{"bar"},
+				JobGUID:  "job-guid",
 			})))
 			Eventually(stream).Should(Receive(Equal(PollJobEvent{
 				State:    JobFailed,
 				Err:      errors.New("bad thing"),
 				Warnings: Warnings{"baz"},
+				JobGUID:  "job-guid",
 			})))
 			Eventually(stream).Should(BeClosed())
 		})

api/cloudcontroller/ccv3/job.go

@@ -150,6 +150,7 @@ type PollJobEvent struct {
 	State    constant.JobState
 	Err      error
 	Warnings Warnings
+	JobGUID  string
 }
 
 func (client *Client) PollJobToEventStream(jobURL JobURL) chan PollJobEvent {
@@ -170,6 +171,7 @@ func (client *Client) PollJobToEventStream(jobURL JobURL) chan PollJobEvent {
 				State:    job.State,
 				Err:      err,
 				Warnings: warnings,
+				JobGUID:  job.GUID,
 			}
 
 			switch {

api/cloudcontroller/ccv3/job_test.go

@@ -431,16 +431,19 @@ var _ = Describe("Job", func() {
 						State:    constant.JobProcessing,
 						Err:      nil,
 						Warnings: Warnings{"warning-1"},
+						JobGUID:  "job-guid",
 					})))
 					Eventually(stream).Should(Receive(Equal(PollJobEvent{
 						State:    constant.JobProcessing,
 						Err:      nil,
 						Warnings: Warnings{"warning-2"},
+						JobGUID:  "job-guid",
 					})))
 					Eventually(stream).Should(Receive(Equal(PollJobEvent{
 						State:    constant.JobComplete,
 						Err:      nil,
 						Warnings: Warnings{"warning-3", "warning-4"},
+						JobGUID:  "job-guid",
 					})))
 					Eventually(stream).Should(BeClosed())
 				})
@@ -458,16 +461,19 @@ var _ = Describe("Job", func() {
 						State:    constant.JobProcessing,
 						Err:      nil,
 						Warnings: Warnings{"warning-1"},
+						JobGUID:  "job-guid",
 					})))
 					Eventually(stream).Should(Receive(Equal(PollJobEvent{
 						State:    constant.JobProcessing,
 						Err:      nil,
 						Warnings: Warnings{"warning-2", "warning-3"},
+						JobGUID:  "job-guid",
 					})))
 					Eventually(stream).Should(Receive(Equal(PollJobEvent{
 						State:    constant.JobFailed,
 						Err:      ccerror.BuildpackAlreadyExistsForStackError{Message: "some-message"},
 						Warnings: Warnings{"warning-4"},
+						JobGUID:  "job-guid",
 					})))
 					Eventually(stream).Should(BeClosed())
 				})
@@ -500,6 +506,7 @@ var _ = Describe("Job", func() {
 								JobGUID: "job-guid",
 							},
 							Warnings: Warnings{"warning-4"},
+							JobGUID:  "job-guid",
 						})))
 						Eventually(stream).Should(BeClosed())
 					})

command/v7/bind_route_service_command.go

@@ -46,7 +46,7 @@ func (cmd BindRouteServiceCommand) Execute(args []string) error {
 		return err
 	}
 
-	completed, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
+	completed, jobGUID, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
 	switch {
 	case err != nil:
 		return err
@@ -56,6 +56,7 @@ func (cmd BindRouteServiceCommand) Execute(args []string) error {
 	default:
 		cmd.UI.DisplayOK()
 		cmd.UI.DisplayText("Binding in progress.")
+		shared.DisplayJobHint(cmd.UI, jobGUID)
 		return nil
 	}
 }

command/v7/bind_route_service_command_test.go

@@ -221,6 +221,7 @@ var _ = Describe("bind-route-service Command", func() {
 					eventStream <- v7action.PollJobEvent{
 						State:    v7action.JobPolling,
 						Warnings: v7action.Warnings{"job polling warning"},
+						JobGUID:  "job-guid",
 					}
 				}()
 
@@ -236,6 +237,7 @@ var _ = Describe("bind-route-service Command", func() {
 					Say(`OK\n`),
 					Say(`\n`),
 					Say(`Binding in progress\.\n`),
+					Say(`Job \(job-guid\) is being processed\.\n`),
 				))
 
 				Expect(testUI.Err).To(SatisfyAll(

command/v7/bind_service_command.go

@@ -57,7 +57,7 @@ func (cmd BindServiceCommand) Execute(args []string) error {
 		return err
 	}
 
-	completed, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
+	completed, jobGUID, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
 	switch {
 	case err != nil:
 		return err
@@ -68,6 +68,7 @@ func (cmd BindServiceCommand) Execute(args []string) error {
 	default:
 		cmd.UI.DisplayOK()
 		cmd.UI.DisplayText("Binding in progress. Use 'cf service {{.ServiceInstanceName}}' to check operation status.", cmd.names())
+		shared.DisplayJobHint(cmd.UI, jobGUID)
 		cmd.UI.DisplayNewline()
 		cmd.UI.DisplayText("TIP: Once this operation succeeds, use 'cf restage {{.AppName}}' to ensure your env variable changes take effect", cmd.names())
 		return nil

command/v7/bind_service_command_test.go

@@ -221,6 +221,7 @@ var _ = Describe("bind-service Command", func() {
 					eventStream <- v7action.PollJobEvent{
 						State:    v7action.JobPolling,
 						Warnings: v7action.Warnings{"job polling warning"},
+						JobGUID:  "job-guid",
 					}
 				}()
 
@@ -236,6 +237,7 @@ var _ = Describe("bind-service Command", func() {
 					Say(`OK\n`),
 					Say(`\n`),
 					Say(`Binding in progress. Use 'cf service %s' to check operation status.\n`, fakeServiceInstanceName),
+					Say(`Job \(job-guid\) is being processed\.\n`),
 					Say(`\n`),
 					Say(`TIP: Once this operation succeeds, use 'cf restage %s' to ensure your env variable changes take effect\n`, fakeAppName),
 				))

command/v7/cleanup_outdated_service_bindings_command.go

@@ -106,7 +106,7 @@ func (cmd CleanupOutdatedServiceBindingsCommand) Execute(args []string) error {
 			return err
 		}
 
-		completed, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
+		completed, jobGUID, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
 		switch {
 		case err != nil:
 			return err
@@ -120,6 +120,7 @@ func (cmd CleanupOutdatedServiceBindingsCommand) Execute(args []string) error {
 			}
 			cmd.UI.DisplayOK()
 			cmd.UI.DisplayText("Unbinding in progress. Use 'cf service {{.ServiceInstanceName}}' to check operation status.", map[string]interface{}{"ServiceInstanceName": si.Name})
+			shared.DisplayJobHint(cmd.UI, jobGUID)
 		}
 	}
 

command/v7/cleanup_outdated_service_bindings_command_test.go

@@ -384,6 +384,7 @@ var _ = Describe("cleanup-outdated-service-bindings Command", func() {
 					eventStream2 <- v7action.PollJobEvent{
 						State:    v7action.JobPolling,
 						Warnings: v7action.Warnings{"job 2 polling warning"},
+						JobGUID:  "job-guid",
 					}
 				}()
 
@@ -423,6 +424,7 @@ var _ = Describe("cleanup-outdated-service-bindings Command", func() {
 					Say(`OK\n`),
 					Say(`\n`),
 					Say(`Unbinding in progress. Use 'cf service %s' to check operation status\.\n`, fakeServiceInstanceName2),
+					Say(`Job \(job-guid\) is being processed\.\n`),
 				))
 
 				Expect(testUI.Err).To(SatisfyAll(

command/v7/create_service_command.go

@@ -95,14 +95,15 @@ func (cmd CreateServiceCommand) Execute(args []string) error {
 	}
 
 	cmd.UI.DisplayNewline()
-	complete, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
+	complete, jobGUID, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
 	switch {
 	case err != nil:
 		return err
 	case complete:
 		cmd.UI.DisplayTextWithFlavor("Service instance {{.ServiceInstanceName}} created.", cmd.serviceInstanceName())
 	default:
 		cmd.UI.DisplayTextWithFlavor("Create in progress. Use 'cf services' or 'cf service {{.ServiceInstanceName}}' to check operation status.", cmd.serviceInstanceName())
+		shared.DisplayJobHint(cmd.UI, jobGUID)
 	}
 
 	cmd.UI.DisplayOK()

command/v7/create_service_command_test.go

@@ -202,6 +202,7 @@ var _ = Describe("create-service Command", func() {
 					fakeStream <- v7action.PollJobEvent{
 						State:    v7action.JobPolling,
 						Warnings: v7action.Warnings{"stream warning"},
+						JobGUID:  "job-guid",
 					}
 				}()
 			})
@@ -211,6 +212,7 @@ var _ = Describe("create-service Command", func() {
 					Say(`Creating service instance %s in org %s / space %s as %s\.\.\.\n`, requestedServiceInstanceName, fakeOrgName, fakeSpaceName, fakeUserName),
 					Say(`\n`),
 					Say(`Create in progress. Use 'cf services' or 'cf service %s' to check operation status\.\n`, requestedServiceInstanceName),
+					Say(`Job \(job-guid\) is being processed\.\n`),
 					Say(`OK`),
 				))
 

command/v7/create_service_key_command.go

@@ -42,7 +42,7 @@ func (cmd CreateServiceKeyCommand) Execute(args []string) error {
 		return err
 	}
 
-	completed, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
+	completed, jobGUID, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
 	switch {
 	case err != nil:
 		return err
@@ -52,6 +52,7 @@ func (cmd CreateServiceKeyCommand) Execute(args []string) error {
 	default:
 		cmd.UI.DisplayOK()
 		cmd.UI.DisplayText("Create in progress.")
+		shared.DisplayJobHint(cmd.UI, jobGUID)
 		return nil
 	}
 }

command/v7/create_service_key_command_test.go

@@ -167,6 +167,7 @@ var _ = Describe("create-service-key Command", func() {
 					eventStream <- v7action.PollJobEvent{
 						State:    v7action.JobPolling,
 						Warnings: v7action.Warnings{"job polling warning"},
+						JobGUID:  "job-guid",
 					}
 				}()
 
@@ -182,6 +183,7 @@ var _ = Describe("create-service-key Command", func() {
 					Say(`OK\n`),
 					Say(`\n`),
 					Say(`Create in progress\.\n`),
+					Say(`Job \(job-guid\) is being processed\.\n`),
 				))
 
 				Expect(testUI.Err).To(SatisfyAll(

command/v7/delete_command.go

@@ -84,7 +84,7 @@ func (cmd DeleteCommand) Execute(args []string) error {
 		}
 	}
 
-	if _, err := shared.WaitForResult(stream, cmd.UI, true); err != nil {
+	if _, _, err := shared.WaitForResult(stream, cmd.UI, true); err != nil {
 		return err
 	}
 

command/v7/delete_org_command.go

@@ -58,7 +58,7 @@ func (cmd *DeleteOrgCommand) Execute(args []string) error {
 		default:
 			return err
 		}
-	} else if _, err := shared.WaitForResult(stream, cmd.UI, true); err != nil {
+	} else if _, _, err := shared.WaitForResult(stream, cmd.UI, true); err != nil {
 		return err
 	}
 

command/v7/delete_service_command.go

@@ -52,7 +52,7 @@ func (cmd DeleteServiceCommand) Execute(args []string) error {
 		return err
 	}
 
-	deleted, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
+	deleted, jobGUID, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
 	if err != nil {
 		return err
 	}
@@ -62,6 +62,7 @@ func (cmd DeleteServiceCommand) Execute(args []string) error {
 		cmd.UI.DisplayTextWithFlavor("Service instance {{.ServiceInstanceName}} deleted.", cmd.serviceInstanceName())
 	default:
 		cmd.UI.DisplayText("Delete in progress. Use 'cf services' or 'cf service {{.ServiceInstanceName}}' to check operation status.", cmd.serviceInstanceName())
+		shared.DisplayJobHint(cmd.UI, jobGUID)
 	}
 
 	cmd.UI.DisplayOK()

command/v7/delete_service_command_test.go

@@ -89,7 +89,8 @@ var _ = Describe("delete-service command", func() {
 
 					go func() {
 						stream <- v7action.PollJobEvent{
-							State: v7action.JobPolling,
+							State:   v7action.JobPolling,
+							JobGUID: "job-guid",
 						}
 						// channel not closed
 					}()
@@ -104,6 +105,7 @@ var _ = Describe("delete-service command", func() {
 				Expect(testUI.Out).To(SatisfyAll(
 					Say("\n"),
 					Say(`Delete in progress. Use 'cf services' or 'cf service %s' to check operation status\.\n`, serviceInstanceName),
+					Say(`Job \(job-guid\) is being processed\.\n`),
 					Say("OK\n"),
 				))
 			})

command/v7/delete_service_key_command.go

@@ -53,7 +53,7 @@ func (cmd DeleteServiceKeyCommand) Execute(args []string) error {
 		return err
 	}
 
-	completed, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
+	completed, jobGUID, err := shared.WaitForResult(stream, cmd.UI, cmd.Wait)
 	switch {
 	case err != nil:
 		return err
@@ -63,6 +63,7 @@ func (cmd DeleteServiceKeyCommand) Execute(args []string) error {
 	default:
 		cmd.UI.DisplayOK()
 		cmd.UI.DisplayText("Delete in progress.")
+		shared.DisplayJobHint(cmd.UI, jobGUID)
 		return nil
 	}
 }

command/v7/delete_service_key_command_test.go

@@ -241,6 +241,7 @@ var _ = Describe("delete-service-key Command", func() {
 					eventStream <- v7action.PollJobEvent{
 						State:    v7action.JobPolling,
 						Warnings: v7action.Warnings{"job polling warning"},
+						JobGUID:  "job-guid",
 					}
 				}()
 
@@ -256,6 +257,7 @@ var _ = Describe("delete-service-key Command", func() {
 					Say(`OK\n`),
 					Say(`\n`),
 					Say(`Delete in progress\.\n`),
+					Say(`Job \(job-guid\) is being processed\.\n`),
 				))
 
 				Expect(testUI.Err).To(SatisfyAll(

command/v7/delete_space_command.go

@@ -74,7 +74,7 @@ func (cmd DeleteSpaceCommand) Execute(args []string) error {
 		default:
 			return err
 		}
-	} else if _, err := shared.WaitForResult(stream, cmd.UI, true); err != nil {
+	} else if _, _, err := shared.WaitForResult(stream, cmd.UI, true); err != nil {
 		return err
 	}