Refactor validation to allow different types of triggers

spinnaker · Jan 9, 2020 · 6190531 · 6190531
1 parent a921c52
commit 6190531
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/...ripts/modules/core/src/pipeline/config/stages/managed/ImportDeliveryConfigStageConfig.tsx b/...ripts/modules/core/src/pipeline/config/stages/managed/ImportDeliveryConfigStageConfig.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
 
 import { SETTINGS } from 'core/config/settings';
-import { IStageConfigProps, FormikStageConfig } from 'core/pipeline';
-import { FormikFormField, TextInput } from 'core/presentation';
+import { IStageConfigProps, FormikStageConfig, IContextualValidator } from 'core/pipeline';
+import { FormikFormField, FormValidator, TextInput } from 'core/presentation';
 import { HelpField } from 'core/help';
+import { IStage } from 'core/domain';
 
 export const ImportDeliveryConfigStageConfig: React.ComponentType<IStageConfigProps> = stageConfigProps => (
   <FormikStageConfig
@@ -27,3 +28,19 @@ export const ImportDeliveryConfigStageConfig: React.ComponentType<IStageConfigPr
     )}
   />
 );
+
+export const validate: IContextualValidator = (_stage: IStage, context: any) => {
+  if (context.pipeline.triggers.length != 1) {
+    return {
+      error:
+        'This stage requires a trigger that provides information about your source control repo (such ' +
+        'as a Git Trigger), to locate your Delivery Config manifest.',
+    };
+  }
+  const formValidator = new FormValidator(context.pipeline.triggers[0]);
+  formValidator.field('source', 'Repo Type').required();
+  formValidator.field('project', 'Project').required();
+  formValidator.field('slug', 'Repo Name').required();
+  formValidator.field('branch', 'Branch').required();
+  return formValidator.validateForm();
+};
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/managed/importDeliveryConfigStage.ts b/app/scripts/modules/core/src/pipeline/config/stages/managed/importDeliveryConfigStage.ts
@@ -1,9 +1,8 @@
 import { Registry } from 'core/registry';
 import { ExecutionDetailsTasks } from 'core/pipeline';
 
-import { ImportDeliveryConfigStageConfig } from './ImportDeliveryConfigStageConfig';
+import { ImportDeliveryConfigStageConfig, validate } from './ImportDeliveryConfigStageConfig';
 import { ImportDeliveryConfigExecutionDetails } from './ImportDeliveryConfigExecutionDetails';
-import { IStageOrTriggerBeforeTypeValidationConfig } from 'core/pipeline/config/validation/stageOrTriggerBeforeType.validator';
 import { SETTINGS } from 'core/config';
 
 if (SETTINGS.feature.managedDelivery) {
@@ -17,14 +16,6 @@ if (SETTINGS.feature.managedDelivery) {
     restartable: false,
     component: ImportDeliveryConfigStageConfig,
     executionDetailsSections: [ImportDeliveryConfigExecutionDetails, ExecutionDetailsTasks],
-    //validateFn: validate,
-    validators: [
-      {
-        type: 'stageOrTriggerBeforeType',
-        // FIXME: this needs to be generalized so that it accepts a rocket trigger in the netflix deployment
-        stageType: 'git',
-        message: 'This stage requires a git trigger to locate your Delivery Config manifest.',
-      } as IStageOrTriggerBeforeTypeValidationConfig,
-    ],
+    validateFn: validate,
   });
 }