Fix instance.Uptime time conversion

* and remove unnecessary pointer for EmbeddedProcessInstances slice

Author: jochenehret

actor/v7action/application_summary.go

@@ -207,10 +207,12 @@ func (actor Actor) getProcessSummariesForSpace(spaceGUID string) (map[string]Pro
 
 	for _, process := range processes {
 		var instanceDetails []ProcessInstance
-		if process.EmbeddedProcessInstances != nil {
-			for _, instance := range *process.EmbeddedProcessInstances {
-				instanceDetails = append(instanceDetails, NewProcessInstance(instance.Index, constant.ProcessInstanceState(instance.State), time.Duration(instance.Since)))
-			}
+		for _, instance := range process.EmbeddedProcessInstances {
+			instanceDetails = append(instanceDetails, NewProcessInstance(
+				instance.Index,
+				constant.ProcessInstanceState(instance.State),
+				time.Duration(instance.Since)*time.Second,
+			))
 		}
 		processSummary := ProcessSummary{
 			Process:         process,

actor/v7action/application_summary_test.go

@@ -3,6 +3,7 @@ package v7action_test
 import (
 	"errors"
 	"fmt"
+	"time"
 
 	"code.cloudfoundry.org/cli/v8/actor/actionerror"
 	. "code.cloudfoundry.org/cli/v8/actor/v7action"
@@ -300,7 +301,7 @@ var _ = Describe("Application Summary Actions", func() {
 							Command:    *types.NewFilteredString("[Redacted Value]"),
 							MemoryInMB: types.NullUint64{Value: 32, IsSet: true},
 							AppGUID:    "some-app-guid",
-							EmbeddedProcessInstances: &[]resources.EmbeddedProcessInstance{
+							EmbeddedProcessInstances: []resources.EmbeddedProcessInstance{
 								{Index: 0, State: "RUNNING", Since: 300},
 								{Index: 1, State: "CRASHED", Since: 0},
 							},
@@ -311,7 +312,7 @@ var _ = Describe("Application Summary Actions", func() {
 							Command:    *types.NewFilteredString("[Redacted Value]"),
 							MemoryInMB: types.NullUint64{Value: 64, IsSet: true},
 							AppGUID:    "some-app-guid",
-							EmbeddedProcessInstances: &[]resources.EmbeddedProcessInstance{
+							EmbeddedProcessInstances: []resources.EmbeddedProcessInstance{
 								{Index: 0, State: "RUNNING", Since: 500},
 								{Index: 1, State: "RUNNING", Since: 600},
 							},
@@ -342,7 +343,7 @@ var _ = Describe("Application Summary Actions", func() {
 										Command:    *types.NewFilteredString("[Redacted Value]"),
 										MemoryInMB: types.NullUint64{Value: 64, IsSet: true},
 										AppGUID:    "some-app-guid",
-										EmbeddedProcessInstances: &[]resources.EmbeddedProcessInstance{
+										EmbeddedProcessInstances: []resources.EmbeddedProcessInstance{
 											{Index: 0, State: "RUNNING", Since: 500},
 											{Index: 1, State: "RUNNING", Since: 600},
 										},
@@ -351,12 +352,12 @@ var _ = Describe("Application Summary Actions", func() {
 										{
 											Index:  0,
 											State:  "RUNNING",
-											Uptime: 500,
+											Uptime: 500 * time.Second,
 										},
 										{
 											Index:  1,
 											State:  "RUNNING",
-											Uptime: 600,
+											Uptime: 600 * time.Second,
 										},
 									},
 								},
@@ -367,7 +368,7 @@ var _ = Describe("Application Summary Actions", func() {
 										Type:       "some-type",
 										Command:    *types.NewFilteredString("[Redacted Value]"),
 										AppGUID:    "some-app-guid",
-										EmbeddedProcessInstances: &[]resources.EmbeddedProcessInstance{
+										EmbeddedProcessInstances: []resources.EmbeddedProcessInstance{
 											{Index: 0, State: "RUNNING", Since: 300},
 											{Index: 1, State: "CRASHED", Since: 0},
 										},
@@ -376,12 +377,12 @@ var _ = Describe("Application Summary Actions", func() {
 										{
 											Index:  0,
 											State:  "RUNNING",
-											Uptime: 300,
+											Uptime: 300 * time.Second,
 										},
 										{
 											Index:  1,
 											State:  "CRASHED",
-											Uptime: 0,
+											Uptime: 0 * time.Second,
 										},
 									},
 								},

resources/process_resource.go

@@ -27,7 +27,7 @@ type Process struct {
 	DiskInMB                              types.NullUint64
 	LogRateLimitInBPS                     types.NullInt
 	AppGUID                               string
-	EmbeddedProcessInstances              *[]EmbeddedProcessInstance
+	EmbeddedProcessInstances              []EmbeddedProcessInstance
 }
 
 type EmbeddedProcessInstance struct {
@@ -80,7 +80,7 @@ func (p *Process) UnmarshalJSON(data []byte) error {
 			} `json:"data"`
 		} `json:"readiness_health_check"`
 
-		EmbeddedProcessInstances *[]EmbeddedProcessInstance `json:"process_instances,omitempty"`
+		EmbeddedProcessInstances []EmbeddedProcessInstance `json:"process_instances,omitempty"`
 	}
 
 	err := cloudcontroller.DecodeJSON(data, &ccProcess)
@@ -104,9 +104,7 @@ func (p *Process) UnmarshalJSON(data []byte) error {
 	p.LogRateLimitInBPS = ccProcess.LogRateLimitInBPS
 	p.Type = ccProcess.Type
 	p.AppGUID = ccProcess.Relationships[constant.RelationshipTypeApplication].GUID
-	if ccProcess.EmbeddedProcessInstances != nil {
-		p.EmbeddedProcessInstances = ccProcess.EmbeddedProcessInstances
-	}
+	p.EmbeddedProcessInstances = ccProcess.EmbeddedProcessInstances
 
 	return nil
 }
@@ -138,7 +136,7 @@ type marshalProcess struct {
 
 	HealthCheck              *healthCheck               `json:"health_check,omitempty"`
 	ReadinessHealthCheck     *readinessHealthCheck      `json:"readiness_health_check,omitempty"`
-	EmbeddedProcessInstances *[]EmbeddedProcessInstance `json:"process_instances,omitempty"`
+	EmbeddedProcessInstances []EmbeddedProcessInstance  `json:"process_instances,omitempty"`
 }
 
 func marshalCommand(p Process, ccProcess *marshalProcess) {
@@ -196,7 +194,7 @@ func marshalLogRateLimit(p Process, ccProcess *marshalProcess) {
 }
 
 func marshalEmbeddedProcessInstances(p Process, ccProcess *marshalProcess) {
-	if p.EmbeddedProcessInstances != nil {
+	if len(p.EmbeddedProcessInstances) > 0 {
 		ccProcess.EmbeddedProcessInstances = p.EmbeddedProcessInstances
 	}
 }