From c8cb9daacf1d38fbe5c003b15c4a92b2449615d8 Mon Sep 17 00:00:00 2001
From: Jammy Louie <jlouie@pivotal.io>
Date: Mon, 12 Nov 2018 09:42:05 -0500
Subject: [PATCH] fix(provider/cf): handle different success/error cases to
 display checksum

---
 .../src/domain/ICloudFoundryDroplet.ts            |  4 ++--
 .../src/domain/ICloudFoundryServerGroup.ts        |  4 +++-
 .../sections/cloudFoundryInfoDetailsSection.tsx   | 15 +++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryDroplet.ts b/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryDroplet.ts
index bbe04d76d0a..048c5e69695 100644
--- a/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryDroplet.ts
+++ b/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryDroplet.ts
@@ -6,8 +6,7 @@ export interface ICloudFoundryDroplet {
   space: ICloudFoundrySpace;
   stack: string;
   buildpacks: ICloudFoundryBuildpack[];
-  sourcePackage: ICloudFoundryPackage;
-  packageChecksum: string;
+  sourcePackage?: ICloudFoundryPackage;
 }
 
 export interface ICloudFoundryBuildpack {
@@ -18,5 +17,6 @@ export interface ICloudFoundryBuildpack {
 }
 
 export interface ICloudFoundryPackage {
+  checksum: string;
   downloadUrl: string;
 }
diff --git a/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryServerGroup.ts b/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryServerGroup.ts
index a98037b614a..19488fc98fb 100644
--- a/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryServerGroup.ts
+++ b/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryServerGroup.ts
@@ -1,14 +1,16 @@
 import { IServerGroup } from '@spinnaker/core';
 
 import { ICloudFoundrySpace, ICloudFoundryDroplet } from 'cloudfoundry/domain';
+import { ICloudFoundryInstance } from 'cloudfoundry/domain/ICloudFoundryInstance';
 
 export interface ICloudFoundryServerGroup extends IServerGroup {
   appsManagerUri: string;
   memory: number;
   diskQuota: number;
   state: 'STARTED' | 'STOPPED';
+  instances: ICloudFoundryInstance[];
   space: ICloudFoundrySpace;
-  droplet: ICloudFoundryDroplet;
+  droplet?: ICloudFoundryDroplet;
   serviceInstances: ICloudFoundryServiceInstance[];
   env: ICloudFoundryEnvVar[];
 }
diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/details/sections/cloudFoundryInfoDetailsSection.tsx b/app/scripts/modules/cloudfoundry/src/serverGroup/details/sections/cloudFoundryInfoDetailsSection.tsx
index e3352bd8f42..351bf83c0d7 100644
--- a/app/scripts/modules/cloudfoundry/src/serverGroup/details/sections/cloudFoundryInfoDetailsSection.tsx
+++ b/app/scripts/modules/cloudfoundry/src/serverGroup/details/sections/cloudFoundryInfoDetailsSection.tsx
@@ -75,12 +75,15 @@ export class CloudFoundryInfoDetailsSection extends React.Component<ICloudFoundr
             <dd>{serverGroup.memory}</dd>
           </dl>
         </CollapsibleSection>
-        <CollapsibleSection heading="Package" defaultExpanded={true}>
-          <dl className="dl-horizontal dl-flex">
-            <dt>Checksum</dt>
-            <dd>{serverGroup.droplet.packageChecksum}</dd>
-          </dl>
-        </CollapsibleSection>
+        {serverGroup.droplet &&
+          serverGroup.droplet.sourcePackage && (
+            <CollapsibleSection heading="Package" defaultExpanded={true}>
+              <dl className="dl-horizontal dl-flex">
+                <dt>Checksum</dt>
+                <dd>{serverGroup.droplet.sourcePackage.checksum}</dd>
+              </dl>
+            </CollapsibleSection>
+          )}
         {!isEmpty(serverGroup.serviceInstances) && (
           <CollapsibleSection heading="Bound Services" defaultExpanded={true}>
             <dl className="dl-horizontal dl-flex">