feat(cf/serverGroup): Use discriminator 'type' field to improve type …

…checking (#6449)
spinnaker · Jan 31, 2019 · 6bdd9b0 · 6bdd9b0
1 parent 201d445
commit 6bdd9b0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...ts/modules/cloudfoundry/src/serverGroup/configure/serverGroupCommandBuilder.service.cf.ts b/...ts/modules/cloudfoundry/src/serverGroup/configure/serverGroupCommandBuilder.service.cf.ts
@@ -93,9 +93,8 @@ export class CloudFoundryServerGroupCommandBuilder {
         routes: serverGroup.loadBalancers,
         environment: CloudFoundryServerGroupCommandBuilder.envVarsFromObject(serverGroup.env),
         services: (serverGroup.serviceInstances || []).map(serviceInstance => serviceInstance.name),
-        reference: '',
-        account: '',
-        pattern: '',
+        healthCheckType: '',
+        healthCheckHttpEndpoint: '',
       };
       command.region = serverGroup.region;
       command.stack = serverGroup.stack;

diff --git a/...cripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupConfigurationModel.cf.ts b/...cripts/modules/cloudfoundry/src/serverGroup/configure/serverGroupConfigurationModel.cf.ts
@@ -12,28 +12,32 @@ export interface ICloudFoundryCreateServerGroupCommand extends IServerGroupComma
 }
 
 export interface ICloudFoundryArtifactSource {
+  type: 'artifact';
   reference: string;
   account: string;
 }
 
 export interface ICloudFoundryPackageSource {
+  type: 'package';
   clusterName: string;
   serverGroupName: string;
   account: string;
   region: string;
 }
 
 export interface ICloudFoundryTriggerSource {
+  type: 'trigger';
   pattern: string;
   account: string; // optional: used in the event that retrieving an artifact from a trigger source requires auth
 }
 
-export type ICloudFoundryBinarySource = { type: string } & (
+export type ICloudFoundryBinarySource =
   | ICloudFoundryArtifactSource
   | ICloudFoundryPackageSource
-  | ICloudFoundryTriggerSource);
+  | ICloudFoundryTriggerSource;
 
 export interface ICloudFoundryManifestDirectSource {
+  type: 'direct';
   memory: string;
   diskQuota: string;
   instances: number;
@@ -46,19 +50,21 @@ export interface ICloudFoundryManifestDirectSource {
 }
 
 export interface ICloudFoundryManifestArtifactSource {
+  type: 'artifact';
   reference: string;
   account: string;
 }
 
 export interface ICloudFoundryManifestTriggerSource {
+  type: 'trigger';
   pattern: string;
   account: string; // optional: used in the event that retrieving a manifest from a trigger source requires auth
 }
 
-export type ICloudFoundryManifestSource = { type: string } & (
+export type ICloudFoundryManifestSource =
   | ICloudFoundryManifestDirectSource
   | ICloudFoundryManifestTriggerSource
-  | ICloudFoundryManifestArtifactSource);
+  | ICloudFoundryManifestArtifactSource;
 
 export interface ICloudFoundryDeployConfiguration {
   account: string;