feat: Moved validation to a separate orchestrator and added validation for improts

Author: kevinwang5658

src/orchestrators/import.ts

@@ -13,6 +13,7 @@ import { FileModificationCalculator, ModificationType } from '../utils/file-modi
 import { groupBy, sleep } from '../utils/index.js';
 import { wildCardMatch } from '../utils/wild-card-match.js';
 import { InitializationResult, InitializeOrchestrator } from './initialize.js';
+import { ValidateOrchestrator } from './validate.js';
 
 export type ImportResult = { result: ResourceConfig[], errors: string[] }
 
@@ -57,7 +58,13 @@ export class ImportOrchestrator {
       throw new Error('At least one resource [type] must be specified. Ex: "codify import homebrew". Or the import command must be run in a directory with a valid codify file')
     }
 
-    await (!typeIds || typeIds.length === 0 ? ImportOrchestrator.runExistingProject(reporter, initializationResult) : ImportOrchestrator.runNewImport(typeIds, reporter, initializationResult));
+    await ValidateOrchestrator.run({ existing: initializationResult }, reporter);
+
+    if (!typeIds || typeIds.length === 0) {
+      await ImportOrchestrator.runExistingProject(reporter, initializationResult);
+    } else {
+      await ImportOrchestrator.runNewImport(typeIds, reporter, initializationResult)
+    }
   }
 
   /** Import new resources. Type ids supplied. This will ask for any required parameters */

src/orchestrators/plan.ts

@@ -5,6 +5,7 @@ import { DependencyMap, PluginManager } from '../plugins/plugin-manager.js';
 import { Reporter } from '../ui/reporters/reporter.js';
 import { createStartupShellScriptsIfNotExists } from '../utils/file.js';
 import { InitializeOrchestrator } from './initialize.js';
+import { ValidateOrchestrator } from './validate.js';
 
 export interface PlanArgs {
   path?: string;
@@ -21,13 +22,14 @@ export class PlanOrchestrator {
   static async run(args: PlanArgs, reporter: Reporter): Promise<PlanOrchestratorResponse> {
     ctx.processStarted(ProcessName.PLAN)
 
-    const { typeIdsToDependenciesMap, pluginManager, project } = await InitializeOrchestrator.run({
+    const initializationResult = await InitializeOrchestrator.run({
       ...args,
     }, reporter);
+    const { typeIdsToDependenciesMap, pluginManager, project } = initializationResult;
 
     await createStartupShellScriptsIfNotExists();
 
-    await PlanOrchestrator.validate(project, pluginManager, typeIdsToDependenciesMap)
+    await ValidateOrchestrator.run({ existing: initializationResult }, reporter);
     project.resolveDependenciesAndCalculateEvalOrder(typeIdsToDependenciesMap);
     project.addXCodeToolsConfig(); // We have to add xcode-tools config always since almost every resource depends on it
 
@@ -46,16 +48,6 @@ export class PlanOrchestrator {
     };
   }
 
-  private static async validate(project: Project, pluginManager: PluginManager, dependencyMap: DependencyMap) {
-    ctx.subprocessStarted(SubProcessName.VALIDATE)
-
-    project.validateTypeIds(dependencyMap);
-    const validationResults = await pluginManager.validate(project);
-    project.handlePluginResourceValidationResults(validationResults);
-
-    ctx.subprocessFinished(SubProcessName.VALIDATE)
-  }
-
   private static async plan(project: Project, pluginManager: PluginManager): Promise<Plan> {
     ctx.subprocessStarted(SubProcessName.GENERATE_PLAN)
     const plan = await pluginManager.plan(project);

src/orchestrators/validate.ts

@@ -0,0 +1,40 @@
+import { ctx, SubProcessName } from '../events/context.js';
+import { DependencyMap, PluginManager } from '../plugins/plugin-manager.js';
+import { Project } from '../entities/project.js';
+import { InitializationResult, InitializeOrchestrator } from './initialize.js';
+import { Reporter } from '../ui/reporters/reporter.js';
+
+export interface ValidateArgs {
+  existing?: InitializationResult;
+  path?: string;
+}
+
+export class ValidateOrchestrator {
+
+  static async run(
+    args: ValidateArgs,
+    reporter: Reporter
+  ): Promise<void> {
+    const {
+      project,
+      typeIdsToDependenciesMap: dependencyMap,
+      pluginManager,
+    } = args.existing ?? await InitializeOrchestrator.run(args, reporter)
+
+    if (args.existing) {
+      ctx.subprocessStarted(SubProcessName.VALIDATE)
+    } else {
+      ctx.processStarted(SubProcessName.VALIDATE)
+    }
+
+    project.validateTypeIds(dependencyMap);
+    const validationResults = await pluginManager.validate(project);
+    project.handlePluginResourceValidationResults(validationResults);
+
+    if (args.existing) {
+      ctx.subprocessFinished(SubProcessName.VALIDATE)
+    } else {
+      ctx.processFinished(SubProcessName.VALIDATE)
+    }
+  }
+}