Merge pull request #237 from sykesm/hm-unknown-instances

Use '?' instead of '-1' when running instances is unknown

[Finishes #76461268]

Author: lvarvel

cf/commands/application/app_test.go

@@ -152,6 +152,50 @@ var _ = Describe("app Command", func() {
 			))
 		})
 	})
+
+	Describe("when running instances is unknown", func() {
+		BeforeEach(func() {
+			app := makeAppWithRoute("my-app")
+			app.RunningInstances = -1
+			appInstance := models.AppInstanceFields{
+				State:     models.InstanceRunning,
+				Since:     testtime.MustParse("Mon Jan 2 15:04:05 -0700 MST 2006", "Mon Jan 2 15:04:05 -0700 MST 2012"),
+				CpuUsage:  5.0,
+				DiskQuota: 4 * formatters.GIGABYTE,
+				DiskUsage: 3 * formatters.GIGABYTE,
+				MemQuota:  2 * formatters.GIGABYTE,
+				MemUsage:  1 * formatters.GIGABYTE,
+			}
+
+			appInstance2 := models.AppInstanceFields{
+				State: models.InstanceRunning,
+				Since: testtime.MustParse("Mon Jan 2 15:04:05 -0700 MST 2006", "Mon Apr 1 15:04:05 -0700 MST 2012"),
+			}
+
+			instances := []models.AppInstanceFields{appInstance, appInstance2}
+
+			appSummaryRepo.GetSummarySummary = app
+			appInstancesRepo.GetInstancesResponses = [][]models.AppInstanceFields{instances}
+			requirementsFactory.Application = app
+		})
+
+		It("displays a '?' for running instances", func() {
+			runCommand("my-app")
+
+			Expect(appSummaryRepo.GetSummaryAppGuid).To(Equal("app-guid"))
+			Expect(appSummaryRepo.GetSummaryAppGuid).To(Equal("app-guid"))
+
+			Expect(ui.Outputs).To(ContainSubstrings(
+				[]string{"Showing health and status", "my-app"},
+				[]string{"state", "started"},
+				[]string{"instances", "?/2"},
+				[]string{"usage", "256M x 2 instances"},
+				[]string{"urls", "my-app.example.com", "foo.example.com"},
+				[]string{"#0", "running", "2012-01-02 03:04:05 PM", "500.0%", "1G of 2G", "3G of 4G"},
+				[]string{"#1", "running", "2012-04-01 03:04:05 PM", "0%", "0 of 0", "0 of 0"},
+			))
+		})
+	})
 })
 
 func makeAppWithRoute(appName string) models.Application {

cf/commands/application/apps_test.go

@@ -106,6 +106,34 @@ var _ = Describe("list-apps command", func() {
 			))
 		})
 
+		Context("when an app's running instances is unknown", func() {
+			It("dipslays a '?' for running instances", func() {
+				appRoutes := []models.RouteSummary{
+					models.RouteSummary{
+						Host:   "app1",
+						Domain: models.DomainFields{Name: "cfapps.io"},
+					}}
+				app := models.Application{}
+				app.Name = "Application-1"
+				app.State = "started"
+				app.RunningInstances = -1
+				app.InstanceCount = 2
+				app.Memory = 512
+				app.DiskQuota = 1024
+				app.Routes = appRoutes
+
+				appSummaryRepo.GetSummariesInCurrentSpaceApps = []models.Application{app}
+
+				runCommand()
+
+				Expect(ui.Outputs).To(ContainSubstrings(
+					[]string{"Getting apps in", "my-org", "my-space", "my-user"},
+					[]string{"OK"},
+					[]string{"Application-1", "started", "?/2", "512M", "1G", "app1.cfapps.io"},
+				))
+			})
+		})
+
 		Context("when there are no apps", func() {
 			It("tells the user that there are no apps", func() {
 				runCommand()

cf/ui_helpers/ui.go

@@ -2,9 +2,10 @@ package ui_helpers
 
 import (
 	"fmt"
-	. "github.com/cloudfoundry/cli/cf/i18n"
 	"strings"
 
+	. "github.com/cloudfoundry/cli/cf/i18n"
+
 	"github.com/cloudfoundry/cli/cf/models"
 	"github.com/cloudfoundry/cli/cf/terminal"
 )
@@ -30,6 +31,10 @@ func ColoredAppState(app models.ApplicationFields) string {
 func ColoredAppInstances(app models.ApplicationFields) string {
 	healthString := fmt.Sprintf("%d/%d", app.RunningInstances, app.InstanceCount)
 
+	if app.RunningInstances < 0 {
+		healthString = fmt.Sprintf("?/%d", app.InstanceCount)
+	}
+
 	if app.RunningInstances == 0 {
 		if strings.ToLower(app.State) == "stopped" {
 			return healthString