From a23501422ad07eb9c3fd83b637e7de9467b530a8 Mon Sep 17 00:00:00 2001 From: Jeff Hui and Michael Maximilien Date: Wed, 21 Jan 2015 15:06:35 -0800 Subject: [PATCH 1/3] Changes text to user for status to be: * create succeeded * create failed [finishes #86578582] --- cf/commands/service/service.go | 4 ++-- cf/commands/service/service_test.go | 24 ++++++++++++------------ cf/commands/service/services_test.go | 2 +- cf/i18n/resources/de_DE.all.json | 10 +++++----- cf/i18n/resources/en_US.all.json | 10 +++++----- cf/i18n/resources/es_ES.all.json | 10 +++++----- cf/i18n/resources/fr_FR.all.json | 10 +++++----- cf/i18n/resources/it_IT.all.json | 10 +++++----- cf/i18n/resources/ja_JA.all.json | 10 +++++----- cf/i18n/resources/pt_BR.all.json | 10 +++++----- cf/i18n/resources/zh_Hans.all.json | 10 +++++----- cf/i18n/resources/zh_Hant.all.json | 10 +++++----- 12 files changed, 60 insertions(+), 60 deletions(-) diff --git a/cf/commands/service/service.go b/cf/commands/service/service.go index 6d685ddfd04..1ccf66134f7 100644 --- a/cf/commands/service/service.go +++ b/cf/commands/service/service.go @@ -97,9 +97,9 @@ func ServiceInstanceStateToStatus(state string, isUserProvidedService bool) stri case "creating": return T("unavailable ({{.State}})", map[string]interface{}{"State": state}) case "failed": - return T("failed ({{.State}})", map[string]interface{}{"State": "creating"}) + return T("create failed") case "available", "": - return T("available") + return T("create succeeded") default: return "" } diff --git a/cf/commands/service/service_test.go b/cf/commands/service/service_test.go index 953fce00a71..676640da28f 100644 --- a/cf/commands/service/service_test.go +++ b/cf/commands/service/service_test.go @@ -104,32 +104,32 @@ var _ = Describe("service command", func() { Expect(requirementsFactory.ServiceInstanceName).To(Equal("service1")) }) - It("shows status: `available` when state is `available`", func() { + It("shows status: `create succeeded` when state is `available`", func() { createServiceInstanceWithState("available") runCommand("service1") Expect(ui.Outputs).To(ContainSubstrings( - []string{"Status: ", "available"}, + []string{"Status: ", "create succeeded"}, )) Expect(requirementsFactory.ServiceInstanceName).To(Equal("service1")) }) - It("shows status: `failed (creating)` when state is `failed`", func() { + It("shows status: `create failed` when state is `failed`", func() { createServiceInstanceWithState("failed") runCommand("service1") Expect(ui.Outputs).To(ContainSubstrings( - []string{"Status: ", "failed (creating)"}, + []string{"Status: ", "create failed"}, )) Expect(requirementsFactory.ServiceInstanceName).To(Equal("service1")) }) - It("shows status: `available` when state is ``", func() { + It("shows status: `create succeeded` when state is ``", func() { createServiceInstanceWithState("") runCommand("service1") Expect(ui.Outputs).To(ContainSubstrings( - []string{"Status: ", "available"}, + []string{"Status: ", "create succeeded"}, )) Expect(requirementsFactory.ServiceInstanceName).To(Equal("service1")) }) @@ -180,19 +180,19 @@ var _ = Describe("ServiceInstanceStateToStatus", func() { Expect(status).To(Equal("unavailable (creating)")) }) - It("returns status: `available` when state: `available`", func() { + It("returns status: `create succeeded` when state: `available`", func() { status := ServiceInstanceStateToStatus("available", isUserProvided) - Expect(status).To(Equal("available")) + Expect(status).To(Equal("create succeeded")) }) - It("returns status: `failed (creating)` when state: `failed`", func() { + It("returns status: `create failed` when state: `failed`", func() { status := ServiceInstanceStateToStatus("failed", isUserProvided) - Expect(status).To(Equal("failed (creating)")) + Expect(status).To(Equal("create failed")) }) - It("returns status: `available` when state: ``", func() { + It("returns status: `create succeeded` when state: ``", func() { status := ServiceInstanceStateToStatus("", isUserProvided) - Expect(status).To(Equal("available")) + Expect(status).To(Equal("create succeeded")) }) }) diff --git a/cf/commands/service/services_test.go b/cf/commands/service/services_test.go index 6cc7b7f5e73..3cd9c6bc2de 100644 --- a/cf/commands/service/services_test.go +++ b/cf/commands/service/services_test.go @@ -113,7 +113,7 @@ var _ = Describe("services", func() { []string{"name", "service", "plan", "bound apps", "status"}, []string{"OK"}, []string{"my-service-1", "cleardb", "spark", "cli1, cli2", "unavailable (creating)"}, - []string{"my-service-2", "cleardb", "spark-2", "cli1", "available"}, + []string{"my-service-2", "cleardb", "spark-2", "cli1", "create succeeded"}, []string{"my-service-provided-by-user", "user-provided", "", "", ""}, )) }) diff --git a/cf/i18n/resources/de_DE.all.json b/cf/i18n/resources/de_DE.all.json index 9f427ba1230..d86cf2b0e89 100644 --- a/cf/i18n/resources/de_DE.all.json +++ b/cf/i18n/resources/de_DE.all.json @@ -4325,8 +4325,8 @@ "modified": false }, { - "id": "available", - "translation": "available", + "id": "create succeeded", + "translation": "create succeeded", "modified": false }, { @@ -4410,8 +4410,8 @@ "modified": false }, { - "id": "failed ({{.State}})", - "translation": "failed ({{.State}})", + "id": "create failed", + "translation": "create failed", "modified": false }, { @@ -4859,4 +4859,4 @@ "translation": "{{.Usage}} {{.FormattedMemory}} x {{.InstanceCount}} instances", "modified": false } -] \ No newline at end of file +] diff --git a/cf/i18n/resources/en_US.all.json b/cf/i18n/resources/en_US.all.json index d2ea9fcb665..b0ce6da688c 100644 --- a/cf/i18n/resources/en_US.all.json +++ b/cf/i18n/resources/en_US.all.json @@ -4325,8 +4325,8 @@ "modified": false }, { - "id": "available", - "translation": "available", + "id": "create succeeded", + "translation": "create succeeded", "modified": false }, { @@ -4410,8 +4410,8 @@ "modified": false }, { - "id": "failed ({{.State}})", - "translation": "failed ({{.State}})", + "id": "create failed", + "translation": "create failed", "modified": false }, { @@ -4859,4 +4859,4 @@ "translation": "{{.Usage}} {{.FormattedMemory}} x {{.InstanceCount}} instances", "modified": false } -] \ No newline at end of file +] diff --git a/cf/i18n/resources/es_ES.all.json b/cf/i18n/resources/es_ES.all.json index 65ab9669869..e5d388e33c2 100644 --- a/cf/i18n/resources/es_ES.all.json +++ b/cf/i18n/resources/es_ES.all.json @@ -4325,8 +4325,8 @@ "modified": false }, { - "id": "available", - "translation": "available", + "id": "create succeeded", + "translation": "create succeeded", "modified": false }, { @@ -4410,8 +4410,8 @@ "modified": false }, { - "id": "failed ({{.State}})", - "translation": "failed ({{.State}})", + "id": "create failed", + "translation": "create failed", "modified": false }, { @@ -4859,4 +4859,4 @@ "translation": "{{.Usage}} {{.FormattedMemory}} x {{.InstanceCount}} instancias", "modified": false } -] \ No newline at end of file +] diff --git a/cf/i18n/resources/fr_FR.all.json b/cf/i18n/resources/fr_FR.all.json index 8394bcde962..8dad39c4989 100644 --- a/cf/i18n/resources/fr_FR.all.json +++ b/cf/i18n/resources/fr_FR.all.json @@ -4325,8 +4325,8 @@ "modified": false }, { - "id": "available", - "translation": "available", + "id": "create succeeded", + "translation": "create succeeded", "modified": false }, { @@ -4410,8 +4410,8 @@ "modified": false }, { - "id": "failed ({{.State}})", - "translation": "failed ({{.State}})", + "id": "create failed", + "translation": "create failed", "modified": false }, { @@ -4859,4 +4859,4 @@ "translation": "{{.Usage}} {{.FormattedMemory}} x {{.InstanceCount}} instances", "modified": false } -] \ No newline at end of file +] diff --git a/cf/i18n/resources/it_IT.all.json b/cf/i18n/resources/it_IT.all.json index 7de6b291b0d..3700e050087 100644 --- a/cf/i18n/resources/it_IT.all.json +++ b/cf/i18n/resources/it_IT.all.json @@ -4325,8 +4325,8 @@ "modified": false }, { - "id": "available", - "translation": "available", + "id": "create succeeded", + "translation": "create succeeded", "modified": false }, { @@ -4410,8 +4410,8 @@ "modified": false }, { - "id": "failed ({{.State}})", - "translation": "failed ({{.State}})", + "id": "create failed", + "translation": "create failed", "modified": false }, { @@ -4859,4 +4859,4 @@ "translation": "{{.Usage}} {{.FormattedMemory}} x {{.InstanceCount}} instances", "modified": false } -] \ No newline at end of file +] diff --git a/cf/i18n/resources/ja_JA.all.json b/cf/i18n/resources/ja_JA.all.json index 7de6b291b0d..3700e050087 100644 --- a/cf/i18n/resources/ja_JA.all.json +++ b/cf/i18n/resources/ja_JA.all.json @@ -4325,8 +4325,8 @@ "modified": false }, { - "id": "available", - "translation": "available", + "id": "create succeeded", + "translation": "create succeeded", "modified": false }, { @@ -4410,8 +4410,8 @@ "modified": false }, { - "id": "failed ({{.State}})", - "translation": "failed ({{.State}})", + "id": "create failed", + "translation": "create failed", "modified": false }, { @@ -4859,4 +4859,4 @@ "translation": "{{.Usage}} {{.FormattedMemory}} x {{.InstanceCount}} instances", "modified": false } -] \ No newline at end of file +] diff --git a/cf/i18n/resources/pt_BR.all.json b/cf/i18n/resources/pt_BR.all.json index 062e6fb18db..675b5b7c2c2 100644 --- a/cf/i18n/resources/pt_BR.all.json +++ b/cf/i18n/resources/pt_BR.all.json @@ -4325,8 +4325,8 @@ "modified": false }, { - "id": "available", - "translation": "available", + "id": "create succeeded", + "translation": "create succeeded", "modified": false }, { @@ -4410,8 +4410,8 @@ "modified": false }, { - "id": "failed ({{.State}})", - "translation": "failed ({{.State}})", + "id": "create failed", + "translation": "create failed", "modified": false }, { @@ -4859,4 +4859,4 @@ "translation": "{{.Usage}} {{.FormattedMemory}} x {{.InstanceCount}} instâncias", "modified": false } -] \ No newline at end of file +] diff --git a/cf/i18n/resources/zh_Hans.all.json b/cf/i18n/resources/zh_Hans.all.json index 44690369bca..06ff779643a 100644 --- a/cf/i18n/resources/zh_Hans.all.json +++ b/cf/i18n/resources/zh_Hans.all.json @@ -4325,8 +4325,8 @@ "modified": false }, { - "id": "available", - "translation": "available", + "id": "create succeeded", + "translation": "create succeeded", "modified": false }, { @@ -4410,8 +4410,8 @@ "modified": false }, { - "id": "failed ({{.State}})", - "translation": "failed ({{.State}})", + "id": "create failed", + "translation": "create failed", "modified": false }, { @@ -4859,4 +4859,4 @@ "translation": "{{.Usage}} {{.FormattedMemory}} 乘以 {{.InstanceCount}}实例数", "modified": false } -] \ No newline at end of file +] diff --git a/cf/i18n/resources/zh_Hant.all.json b/cf/i18n/resources/zh_Hant.all.json index 9f427ba1230..d86cf2b0e89 100644 --- a/cf/i18n/resources/zh_Hant.all.json +++ b/cf/i18n/resources/zh_Hant.all.json @@ -4325,8 +4325,8 @@ "modified": false }, { - "id": "available", - "translation": "available", + "id": "create succeeded", + "translation": "create succeeded", "modified": false }, { @@ -4410,8 +4410,8 @@ "modified": false }, { - "id": "failed ({{.State}})", - "translation": "failed ({{.State}})", + "id": "create failed", + "translation": "create failed", "modified": false }, { @@ -4859,4 +4859,4 @@ "translation": "{{.Usage}} {{.FormattedMemory}} x {{.InstanceCount}} instances", "modified": false } -] \ No newline at end of file +] From 9bfb7cf288924674d696197b287d19a73ed4cddc Mon Sep 17 00:00:00 2001 From: Jeff Hui and Michael Maximilien Date: Wed, 21 Jan 2015 16:08:52 -0800 Subject: [PATCH 2/3] Changing expected state from CC to be: * `in progress` vs `creating` * `succeeded` vs `created` [#86578718] --- cf/commands/service/service.go | 6 +++--- cf/commands/service/service_test.go | 26 +++++++++++++------------- cf/commands/service/services_test.go | 4 ++-- cf/i18n/resources/de_DE.all.json | 4 ++-- cf/i18n/resources/en_US.all.json | 4 ++-- cf/i18n/resources/es_ES.all.json | 4 ++-- cf/i18n/resources/fr_FR.all.json | 4 ++-- cf/i18n/resources/it_IT.all.json | 4 ++-- cf/i18n/resources/ja_JA.all.json | 4 ++-- cf/i18n/resources/pt_BR.all.json | 4 ++-- cf/i18n/resources/zh_Hans.all.json | 4 ++-- cf/i18n/resources/zh_Hant.all.json | 4 ++-- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/cf/commands/service/service.go b/cf/commands/service/service.go index 1ccf66134f7..890f0b6ef0f 100644 --- a/cf/commands/service/service.go +++ b/cf/commands/service/service.go @@ -94,11 +94,11 @@ func ServiceInstanceStateToStatus(state string, isUserProvidedService bool) stri return "" } switch state { - case "creating": - return T("unavailable ({{.State}})", map[string]interface{}{"State": state}) + case "in progress": + return T("create in progress") case "failed": return T("create failed") - case "available", "": + case "succeeded", "": return T("create succeeded") default: return "" diff --git a/cf/commands/service/service_test.go b/cf/commands/service/service_test.go index 676640da28f..f2785976ef8 100644 --- a/cf/commands/service/service_test.go +++ b/cf/commands/service/service_test.go @@ -63,7 +63,7 @@ var _ = Describe("service command", func() { serviceInstance := models.ServiceInstance{} serviceInstance.Name = "service1" serviceInstance.Guid = "service1-guid" - serviceInstance.State = "creating" + serviceInstance.State = "in progress" serviceInstance.StateDescription = "creating resource - step 1" serviceInstance.ServicePlan = plan serviceInstance.ServiceOffering = offering @@ -77,7 +77,7 @@ var _ = Describe("service command", func() { } It("shows the service", func() { - createServiceInstanceWithState("creating") + createServiceInstanceWithState("in progress") runCommand("service1") Expect(ui.Outputs).To(ContainSubstrings( @@ -87,25 +87,25 @@ var _ = Describe("service command", func() { []string{"Description: ", "the-description"}, []string{"Documentation url: ", "http://documentation.url"}, []string{"Dashboard: ", "some-url"}, - []string{"Status: ", "unavailable (creating)"}, + []string{"Status: ", "create in progress"}, []string{"Message: ", "creating resource - step 1"}, )) Expect(requirementsFactory.ServiceInstanceName).To(Equal("service1")) }) Context("shows correct status information based on service instance state", func() { - It("shows status: `unavailable (creating)` when state is `creating`", func() { - createServiceInstanceWithState("creating") + It("shows status: `create in progress` when state is `in progress`", func() { + createServiceInstanceWithState("in progress") runCommand("service1") Expect(ui.Outputs).To(ContainSubstrings( - []string{"Status: ", "unavailable (creating)"}, + []string{"Status: ", "create in progress"}, )) Expect(requirementsFactory.ServiceInstanceName).To(Equal("service1")) }) - It("shows status: `create succeeded` when state is `available`", func() { - createServiceInstanceWithState("available") + It("shows status: `create succeeded` when state is `succeeded`", func() { + createServiceInstanceWithState("succeeded") runCommand("service1") Expect(ui.Outputs).To(ContainSubstrings( @@ -175,13 +175,13 @@ var _ = Describe("ServiceInstanceStateToStatus", func() { Context("when the service is not user provided", func() { isUserProvided := false - It("returns status: `unavailable (creating)` when state: `creating`", func() { - status := ServiceInstanceStateToStatus("creating", isUserProvided) - Expect(status).To(Equal("unavailable (creating)")) + It("returns status: `create in progress` when state: `in progress`", func() { + status := ServiceInstanceStateToStatus("in progress", isUserProvided) + Expect(status).To(Equal("create in progress")) }) - It("returns status: `create succeeded` when state: `available`", func() { - status := ServiceInstanceStateToStatus("available", isUserProvided) + It("returns status: `create succeeded` when state: `succeeded`", func() { + status := ServiceInstanceStateToStatus("succeeded", isUserProvided) Expect(status).To(Equal("create succeeded")) }) diff --git a/cf/commands/service/services_test.go b/cf/commands/service/services_test.go index 3cd9c6bc2de..b0f0d8b4692 100644 --- a/cf/commands/service/services_test.go +++ b/cf/commands/service/services_test.go @@ -83,7 +83,7 @@ var _ = Describe("services", func() { serviceInstance := models.ServiceInstance{} serviceInstance.Name = "my-service-1" - serviceInstance.State = "creating" + serviceInstance.State = "in progress" serviceInstance.StateDescription = "fake state description" serviceInstance.ServicePlan = plan serviceInstance.ApplicationNames = []string{"cli1", "cli2"} @@ -112,7 +112,7 @@ var _ = Describe("services", func() { []string{"Getting services in org", "my-org", "my-space", "my-user"}, []string{"name", "service", "plan", "bound apps", "status"}, []string{"OK"}, - []string{"my-service-1", "cleardb", "spark", "cli1, cli2", "unavailable (creating)"}, + []string{"my-service-1", "cleardb", "spark", "cli1, cli2", "create in progress"}, []string{"my-service-2", "cleardb", "spark-2", "cli1", "create succeeded"}, []string{"my-service-provided-by-user", "user-provided", "", "", ""}, )) diff --git a/cf/i18n/resources/de_DE.all.json b/cf/i18n/resources/de_DE.all.json index d86cf2b0e89..0cc675623fb 100644 --- a/cf/i18n/resources/de_DE.all.json +++ b/cf/i18n/resources/de_DE.all.json @@ -4705,8 +4705,8 @@ "modified": true }, { - "id": "unavailable ({{.State}})", - "translation": "unavailable ({{.State}})", + "id": "create in progress", + "translation": "create in progress", "modified": false }, { diff --git a/cf/i18n/resources/en_US.all.json b/cf/i18n/resources/en_US.all.json index b0ce6da688c..e68e4ed64a5 100644 --- a/cf/i18n/resources/en_US.all.json +++ b/cf/i18n/resources/en_US.all.json @@ -4705,8 +4705,8 @@ "modified": false }, { - "id": "unavailable ({{.State}})", - "translation": "unavailable ({{.State}})", + "id": "create in progress", + "translation": "create in progress", "modified": false }, { diff --git a/cf/i18n/resources/es_ES.all.json b/cf/i18n/resources/es_ES.all.json index e5d388e33c2..c3b171e321f 100644 --- a/cf/i18n/resources/es_ES.all.json +++ b/cf/i18n/resources/es_ES.all.json @@ -4705,8 +4705,8 @@ "modified": true }, { - "id": "unavailable ({{.State}})", - "translation": "unavailable ({{.State}})", + "id": "create in progress", + "translation": "create in progress", "modified": false }, { diff --git a/cf/i18n/resources/fr_FR.all.json b/cf/i18n/resources/fr_FR.all.json index 8dad39c4989..b9f03825f6a 100644 --- a/cf/i18n/resources/fr_FR.all.json +++ b/cf/i18n/resources/fr_FR.all.json @@ -4705,8 +4705,8 @@ "modified": true }, { - "id": "unavailable ({{.State}})", - "translation": "unavailable ({{.State}})", + "id": "create in progress", + "translation": "create in progress", "modified": false }, { diff --git a/cf/i18n/resources/it_IT.all.json b/cf/i18n/resources/it_IT.all.json index 3700e050087..3edb628dd00 100644 --- a/cf/i18n/resources/it_IT.all.json +++ b/cf/i18n/resources/it_IT.all.json @@ -4705,8 +4705,8 @@ "modified": true }, { - "id": "unavailable ({{.State}})", - "translation": "unavailable ({{.State}})", + "id": "create in progress", + "translation": "create in progress", "modified": false }, { diff --git a/cf/i18n/resources/ja_JA.all.json b/cf/i18n/resources/ja_JA.all.json index 3700e050087..3edb628dd00 100644 --- a/cf/i18n/resources/ja_JA.all.json +++ b/cf/i18n/resources/ja_JA.all.json @@ -4705,8 +4705,8 @@ "modified": true }, { - "id": "unavailable ({{.State}})", - "translation": "unavailable ({{.State}})", + "id": "create in progress", + "translation": "create in progress", "modified": false }, { diff --git a/cf/i18n/resources/pt_BR.all.json b/cf/i18n/resources/pt_BR.all.json index 675b5b7c2c2..b4ef47aa6c1 100644 --- a/cf/i18n/resources/pt_BR.all.json +++ b/cf/i18n/resources/pt_BR.all.json @@ -4705,8 +4705,8 @@ "modified": false }, { - "id": "unavailable ({{.State}})", - "translation": "unavailable ({{.State}})", + "id": "create in progress", + "translation": "create in progress", "modified": false }, { diff --git a/cf/i18n/resources/zh_Hans.all.json b/cf/i18n/resources/zh_Hans.all.json index 06ff779643a..8ef6af94466 100644 --- a/cf/i18n/resources/zh_Hans.all.json +++ b/cf/i18n/resources/zh_Hans.all.json @@ -4705,8 +4705,8 @@ "modified": true }, { - "id": "unavailable ({{.State}})", - "translation": "unavailable ({{.State}})", + "id": "create in progress", + "translation": "create in progress", "modified": false }, { diff --git a/cf/i18n/resources/zh_Hant.all.json b/cf/i18n/resources/zh_Hant.all.json index d86cf2b0e89..0cc675623fb 100644 --- a/cf/i18n/resources/zh_Hant.all.json +++ b/cf/i18n/resources/zh_Hant.all.json @@ -4705,8 +4705,8 @@ "modified": true }, { - "id": "unavailable ({{.State}})", - "translation": "unavailable ({{.State}})", + "id": "create in progress", + "translation": "create in progress", "modified": false }, { From a32c7c1ab45104f6e1b72686a5aea132a1bf1ae2 Mon Sep 17 00:00:00 2001 From: David Sabeti and Jeff Hui Date: Thu, 22 Jan 2015 10:04:34 -0800 Subject: [PATCH 3/3] Fixed bug where `cf services` would not parse the JSON... for `state` and `state_description` keys to emit. It instead just defaulting to `succeeded`. [finishes #62068908] --- cf/api/service_summary.go | 9 +++++++-- cf/api/service_summary_test.go | 32 ++++++++++++++++++-------------- cf/commands/service/service.go | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/cf/api/service_summary.go b/cf/api/service_summary.go index 1e64b7632dc..e8da2ca3903 100644 --- a/cf/api/service_summary.go +++ b/cf/api/service_summary.go @@ -2,6 +2,7 @@ package api import ( "fmt" + "github.com/cloudfoundry/cli/cf/configuration/core_config" "github.com/cloudfoundry/cli/cf/models" "github.com/cloudfoundry/cli/cf/net" @@ -29,6 +30,8 @@ func (resource ServiceInstancesSummaries) ToModels() (instances []models.Service instance := models.ServiceInstance{} instance.Name = instanceSummary.Name + instance.State = instanceSummary.State + instance.StateDescription = instanceSummary.StateDescription instance.ApplicationNames = applicationNames instance.ServicePlan = servicePlan instance.ServiceOffering = serviceOffering @@ -57,8 +60,10 @@ type ServiceInstanceSummaryApp struct { } type ServiceInstanceSummary struct { - Name string - ServicePlan ServicePlanSummary `json:"service_plan"` + Name string + State string + StateDescription string `json:"state_description"` + ServicePlan ServicePlanSummary `json:"service_plan"` } type ServicePlanSummary struct { diff --git a/cf/api/service_summary_test.go b/cf/api/service_summary_test.go index 5088e13b93f..5b239c5093a 100644 --- a/cf/api/service_summary_test.go +++ b/cf/api/service_summary_test.go @@ -37,21 +37,23 @@ var _ = Describe("ServiceSummaryRepository", func() { } ], "services": [ - { - "guid": "my-service-instance-guid", - "name": "my-service-instance", - "bound_app_count": 2, - "service_plan": { - "guid": "service-plan-guid", - "name": "spark", - "service": { - "guid": "service-offering-guid", - "label": "cleardb", - "provider": "cleardb-provider", - "version": "n/a" + { + "guid": "my-service-instance-guid", + "name": "my-service-instance", + "bound_app_count": 2, + "state": "in progress", + "state_description": "50% done", + "service_plan": { + "guid": "service-plan-guid", + "name": "spark", + "service": { + "guid": "service-offering-guid", + "label": "cleardb", + "provider": "cleardb-provider", + "version": "n/a" + } + } } - } - } ] }`, } @@ -75,6 +77,8 @@ var _ = Describe("ServiceSummaryRepository", func() { instance1 := serviceInstances[0] Expect(instance1.Name).To(Equal("my-service-instance")) + Expect(instance1.State).To(Equal("in progress")) + Expect(instance1.StateDescription).To(Equal("50% done")) Expect(instance1.ServicePlan.Name).To(Equal("spark")) Expect(instance1.ServiceOffering.Label).To(Equal("cleardb")) Expect(instance1.ServiceOffering.Label).To(Equal("cleardb")) diff --git a/cf/commands/service/service.go b/cf/commands/service/service.go index 890f0b6ef0f..6727ec1a9dd 100644 --- a/cf/commands/service/service.go +++ b/cf/commands/service/service.go @@ -79,7 +79,7 @@ func (cmd *ShowService) Run(c *cli.Context) { })) cmd.ui.Say(T("Status: {{.Status}}", map[string]interface{}{ - "Status": ServiceInstanceStateToStatus(serviceInstance.State, serviceInstance.IsUserProvided()), + "Status": terminal.EntityNameColor(ServiceInstanceStateToStatus(serviceInstance.State, serviceInstance.IsUserProvided())), })) cmd.ui.Say(T("Message: {{.Message}}", map[string]interface{}{