Enhance "service" command for multiple service bindings

* in the "bound apps" section, show also multiple service bindings for an app
* add binding guid and created_at timestamp to table
* sort by 1. name 2. created_at

Author: jochenehret

command/v7/service_command.go

@@ -2,6 +2,7 @@ package v7
 
 import (
 	"fmt"
+	"sort"
 	"strconv"
 
 	"code.cloudfoundry.org/cli/v8/actor/v7action"
@@ -240,13 +241,25 @@ func (cmd ServiceCommand) displayBoundApps(serviceInstanceWithDetails v7action.S
 		return
 	}
 
-	table := [][]string{{"name", "binding name", "status", "message"}}
-	for _, app := range serviceInstanceWithDetails.BoundApps {
+	table := [][]string{{"name", "binding name", "status", "message", "guid", "created_at"}}
+
+	bindings := serviceInstanceWithDetails.BoundApps
+	// sort by app name, then by created at descending
+	sort.Slice(bindings, func(i, j int) bool {
+		if bindings[i].AppName == bindings[j].AppName {
+			return bindings[i].CreatedAt > bindings[j].CreatedAt
+		}
+		return bindings[i].AppName < bindings[j].AppName
+	})
+
+	for _, app := range bindings {
 		table = append(table, []string{
 			app.AppName,
 			app.Name,
 			fmt.Sprintf("%s %s", app.LastOperation.Type, app.LastOperation.State),
 			app.LastOperation.Description,
+			app.GUID,
+			app.CreatedAt,
 		})
 	}
 

command/v7/service_command_test.go

@@ -271,19 +271,23 @@ var _ = Describe("service command", func() {
 							{
 								Name:    "named-binding",
 								AppName: "app-1",
+								GUID:    "guid-1",
 								LastOperation: resources.LastOperation{
 									Type:        resources.CreateOperation,
 									State:       resources.OperationSucceeded,
 									Description: "great",
 								},
+								CreatedAt: "created-at-1",
 							},
 							{
 								AppName: "app-2",
+								GUID:    "guid-2",
 								LastOperation: resources.LastOperation{
 									Type:        resources.UpdateOperation,
 									State:       resources.OperationFailed,
 									Description: "sorry",
 								},
+								CreatedAt: "created-at-2",
 							},
 						},
 					},
@@ -295,9 +299,9 @@ var _ = Describe("service command", func() {
 			It("prints the bound apps table", func() {
 				Expect(testUI.Out).To(SatisfyAll(
 					Say(`Showing bound apps:\n`),
-					Say(`   name\s+binding name\s+status\s+message\n`),
-					Say(`   app-1\s+named-binding\s+create succeeded\s+great\n`),
-					Say(`   app-2\s+update failed\s+sorry\n`),
+					Say(`   name\s+binding name\s+status\s+message\s+guid\s+created_at\n`),
+					Say(`   app-1\s+named-binding\s+create succeeded\s+great\s+guid-1\s+created-at-1\n`),
+					Say(`   app-2\s+update failed\s+sorry\s+guid-2\s+created-at-2\n`),
 				))
 			})
 		})
@@ -704,19 +708,34 @@ var _ = Describe("service command", func() {
 							{
 								Name:    "named-binding",
 								AppName: "app-1",
+								GUID:    "guid-1",
 								LastOperation: resources.LastOperation{
 									Type:        resources.CreateOperation,
 									State:       resources.OperationSucceeded,
 									Description: "great",
 								},
+								CreatedAt: "created-at-1",
 							},
 							{
 								AppName: "app-2",
+								GUID:    "guid-2",
 								LastOperation: resources.LastOperation{
 									Type:        resources.UpdateOperation,
 									State:       resources.OperationFailed,
 									Description: "sorry",
 								},
+								CreatedAt: "created-at-2",
+							},
+							{
+								Name:    "named-binding",
+								AppName: "app-1",
+								GUID:    "guid-3",
+								LastOperation: resources.LastOperation{
+									Type:        resources.CreateOperation,
+									State:       resources.OperationSucceeded,
+									Description: "great",
+								},
+								CreatedAt: "created-at-2",
 							},
 						},
 					},
@@ -728,9 +747,10 @@ var _ = Describe("service command", func() {
 			It("prints the bound apps table", func() {
 				Expect(testUI.Out).To(SatisfyAll(
 					Say(`Showing bound apps:\n`),
-					Say(`name\s+binding name\s+status\s+message\n`),
-					Say(`app-1\s+named-binding\s+create succeeded\s+great\n`),
-					Say(`app-2\s+update failed\s+sorry\n`),
+					Say(`name\s+binding name\s+status\s+message\s+guid\s+created_at\n`),
+					Say(`app-1\s+named-binding\s+create succeeded\s+great\s+guid-3\s+created-at-2\n`),
+					Say(`app-1\s+named-binding\s+create succeeded\s+great\s+guid-1\s+created-at-1\n`),
+					Say(`app-2\s+update failed\s+sorry\s+guid-2\s+created-at-2\n`),
 				))
 			})
 		})

resources/service_credential_binding_resource.go

@@ -31,6 +31,8 @@ type ServiceCredentialBinding struct {
 	LastOperation LastOperation `jsonry:"last_operation"`
 	// Parameters can be specified when creating a binding
 	Parameters types.OptionalObject `jsonry:"parameters"`
+	// CreatedAt timestamp when the binding was created (useful for distinguishing multiple bindings)
+	CreatedAt string `json:"created_at,omitempty"`
 }
 
 func (s ServiceCredentialBinding) MarshalJSON() ([]byte, error) {

resources/service_credential_binding_resource_test.go

@@ -60,6 +60,7 @@ var _ = Describe("service credential binding resource", func() {
 				}
 			}`,
 		),
+		Entry("created_at", ServiceCredentialBinding{CreatedAt: "fake-created-at"}, `{"created_at": "fake-created-at"}`),
 		Entry(
 			"everything",
 			ServiceCredentialBinding{
@@ -71,6 +72,7 @@ var _ = Describe("service credential binding resource", func() {
 				Parameters: types.NewOptionalObject(map[string]interface{}{
 					"foo": "bar",
 				}),
+				CreatedAt: "fake-created-at",
 			},
 			`{
 				"type": "app",
@@ -90,7 +92,8 @@ var _ = Describe("service credential binding resource", func() {
 				},
 				"parameters": {
 					"foo": "bar"
-				}
+				},
+				"created_at": "fake-created-at"
 			}`,
 		),
 	)