feat(provider/cf): display cf health check details for app (#6081)

spinnaker · Nov 27, 2018 · 790c4b6 · 790c4b6
1 parent ce9f2cb
commit 790c4b6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryServerGroup.ts b/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryServerGroup.ts
@@ -7,6 +7,8 @@ export interface ICloudFoundryServerGroup extends IServerGroup {
   appsManagerUri: string;
   memory: number;
   diskQuota: number;
+  healthCheckType: string;
+  healthCheckHttpEndpoint: string;
   state: 'STARTED' | 'STOPPED';
   instances: ICloudFoundryInstance[];
   space: ICloudFoundrySpace;

diff --git a/...cripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupConfigurationModel.cf.ts b/...cripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupConfigurationModel.cf.ts
@@ -39,7 +39,7 @@ export interface ICloudFoundryManifestDirectSource {
   instances: number;
   buildpack: string;
   healthCheckType: string;
-  healthCheckEndpoint: string;
+  healthCheckHttpEndpoint: string;
   routes: string[];
   environment: ICloudFoundryEnvVar[];
   services: string[];

diff --git a/...dules/cloudfoundry/src/serverGroup/configure/wizard/sections/configurationSettings.cf.tsx b/...dules/cloudfoundry/src/serverGroup/configure/wizard/sections/configurationSettings.cf.tsx
@@ -59,7 +59,7 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
           instances: 1,
           buildpack: undefined,
           healthCheckType: 'port',
-          healthCheckEndpoint: undefined,
+          healthCheckHttpEndpoint: undefined,
           routes: [],
           environment: [],
           services: [],
@@ -161,7 +161,7 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
             <div className="form-group">
               <div className="col-md-3 sm-label-right">Health Check Endpoint</div>
               <div className="col-md-7">
-                <Field type="text" name="manifest.healthCheckEndpoint" />
+                <Field type="text" name="manifest.healthCheckHttpEndpoint" />
               </div>
             </div>
           )}

diff --git a/.../modules/cloudfoundry/src/serverGroup/details/sections/cloudFoundryInfoDetailsSection.tsx b/.../modules/cloudfoundry/src/serverGroup/details/sections/cloudFoundryInfoDetailsSection.tsx
@@ -75,6 +75,18 @@ export class CloudFoundryInfoDetailsSection extends React.Component<ICloudFoundr
             <dd>{serverGroup.memory}</dd>
           </dl>
         </CollapsibleSection>
+        <CollapsibleSection heading="Health Check" defaultExpanded={true}>
+          <dl className="dl-horizontal dl-flex">
+            <dt>Type</dt>
+            <dd>{serverGroup.healthCheckType}</dd>
+            {serverGroup.healthCheckType === 'http' && (
+              <div>
+                <dt>Endpoint</dt>
+                <dd>{serverGroup.healthCheckHttpEndpoint}</dd>
+              </div>
+            )}
+          </dl>
+        </CollapsibleSection>
         {serverGroup.droplet &&
           serverGroup.droplet.sourcePackage && (
             <CollapsibleSection heading="Package" defaultExpanded={true}>