fix(provider/cf): handle different success/error cases to display che…

…cksum
christopherthielen · Nov 12, 2018 · c8cb9da · c8cb9da
1 parent 5413003
commit c8cb9da
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git 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
@@ -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/.../modules/cloudfoundry/src/serverGroup/details/sections/cloudFoundryInfoDetailsSection.tsx b/.../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">