fix: Fixed tests

Author: kevinwang5658

codify.json

@@ -56,7 +56,8 @@
       "sshpass",
       "tart",
       "xz",
-      "zstd"
+      "zstd",
+      "f1bonacc1/tap/process-compose"
     ]
   },
   { "version":"1.10.5","type":"terraform" },

src/orchestrators/destroy.ts

@@ -34,7 +34,6 @@ export class DestroyOrchestrator {
       ? await DestroyOrchestrator.destroyExistingProject(reporter, initializationResult)
       : await DestroyOrchestrator.destroySpecificResources(typeIds, reporter, initializationResult)
 
-
     plan.sortByEvalOrder(project.evaluationOrder);
     destroyProject.removeNoopFromEvaluationOrder(plan);
 
@@ -70,7 +69,8 @@ Open a new terminal or source '.zshrc' for the new changes to be reflected`);
   ): Promise<{ plan: Plan, destroyProject: Project }> {
     const { project, pluginManager, typeIdsToDependenciesMap } = initializeResult;
 
-    const matchedTypes = this.matchTypeIds(typeIds, [...typeIdsToDependenciesMap.keys()])
+    // TODO: In the future if a user supplies resourceId.name (naming a specific resource) destroy that resource instead of stripping the name out.
+    const matchedTypes = this.matchTypeIds(typeIds.map((id) => id.split('.').at(0) ?? ''), [...typeIdsToDependenciesMap.keys()])
     await DestroyOrchestrator.validateTypeIds(matchedTypes, project, pluginManager, typeIdsToDependenciesMap);
 
     const resourceInfoList = (await pluginManager.getMultipleResourceInfo(matchedTypes));
@@ -139,7 +139,7 @@ Open a new terminal or source '.zshrc' for the new changes to be reflected`);
     }
 
     if (unsupportedTypeIds.length > 0) {
-      throw new Error(`The following resources cannot be imported. No plugins found that support the following types:
+      throw new Error(`The following resources cannot be destroyed. No plugins found that support the following types:
 ${JSON.stringify(unsupportedTypeIds)}`);
     }
 

src/ui/components/multi-select/MultiSelect.test.tsx

@@ -8,6 +8,8 @@ import { ResourceOperation } from 'codify-schemas';
 import { MockReporter } from '../mocks/reporter.js';
 import { MockResource, MockResourceConfig } from '../mocks/resource';
 import { ResourceSettings } from 'codify-plugin-lib';
+import { ResourceInfo } from '../../../src/entities/resource-info';
+import { ResourceConfig } from '../../../src/entities/resource-config';
 
 vi.mock('../mocks/get-mock-resources.js', async () => {
   return {
@@ -39,6 +41,21 @@ describe('Destroy orchestrator tests', () => {
         expect(plan.getResourcePlan('mock')).toMatchObject({
           operation: ResourceOperation.DESTROY,
         });
+      },
+      promptUserForValues(info: ResourceInfo[]): ResourceConfig[] {
+        expect(info.length).to.eq(1);
+        expect(info[0]).toMatchObject({
+          type: 'mock',
+          importAndDestroy: {
+            requiredParameters: expect.arrayContaining(['propB']),
+          }
+        })
+
+        return [new ResourceConfig({
+          type: 'mock',
+          propA: 'current',
+          propB: 1,
+        })]
       }
     });
 
@@ -62,12 +79,24 @@ describe('Destroy orchestrator tests', () => {
   it('Can handle a destroy call on a resource that doesn\'t exist', { timeout: 3000000 }, async () => {
     const reporter = new MockReporter({
       validatePlan(plan: Plan) {
-        expect(plan.getResourcePlan('mock.0')).toMatchObject({
-          operation: ResourceOperation.NOOP,
-        });
-        expect(plan.getResourcePlan('mock.1')).toMatchObject({
+        expect(plan.getResourcePlan('mock')).toMatchObject({
           operation: ResourceOperation.NOOP,
         });
+      },
+      promptUserForValues(info: ResourceInfo[]): ResourceConfig[] {
+        expect(info.length).to.eq(1);
+        expect(info[0]).toMatchObject({
+          type: 'mock',
+          importAndDestroy: {
+            requiredParameters: expect.arrayContaining(['propB']),
+          }
+        })
+
+        return [new ResourceConfig({
+          type: 'mock',
+          propA: 'current',
+          propB: 1,
+        })]
       }
     });
 
@@ -82,10 +111,24 @@ describe('Destroy orchestrator tests', () => {
   it('Can handle destroying only one resource', async () => {
     const reporter = new MockReporter({
       validatePlan(plan: Plan) {
-        expect(plan.getResourcePlan('mock.0')).toMatchObject({
+        expect(plan.getResourcePlan('mock')).toMatchObject({
           operation: ResourceOperation.DESTROY,
         });
-        expect(plan.getResourcePlan('mock.1')).to.be.null;
+      },
+      promptUserForValues(info: ResourceInfo[]): ResourceConfig[] {
+        expect(info.length).to.eq(1);
+        expect(info[0]).toMatchObject({
+          type: 'mock',
+          importAndDestroy: {
+            requiredParameters: expect.arrayContaining(['propB']),
+          }
+        })
+
+        return [new ResourceConfig({
+          type: 'mock',
+          propA: 'current',
+          propB: 1,
+        })]
       }
     });
 

test/orchestrator/destroy/destroy.test.ts

@@ -224,7 +224,7 @@ describe('Import orchestrator tests', () => {
             name: 'requiredProp',
             type: 'string',
             value: "this-jenv",
-            isRequired: true,
+            isRequiredForImport: true,
           }),
         ]))
 
@@ -594,7 +594,7 @@ describe('Import orchestrator tests', () => {
             name: 'requiredProp',
             type: 'string',
             value: "this-jenv",
-            isRequired: true,
+            isRequiredForImport: true,
           }),
         ]))
 

test/orchestrator/import/import.test.ts

@@ -15,9 +15,14 @@ export interface MockReporterConfig {
   promptConfirmation?: () => boolean;
   promptOptions?: (message: string, options: string[]) => number;
   promptUserForValues?: (resourceInfo: ResourceInfo[]) => Promise<ResourceConfig[]> | ResourceConfig[];
+  promptInput?: (prompt: string, error?: string | undefined, validation?: (() => Promise<boolean>) | undefined, autoComplete?: ((input: string) => string[]) | undefined) => Promise<string>
+  promptInitResultSelection?: (availableTypes: string[]) => Promise<void> | void;
+  hide?: () => void;
   displayImportResult?: (importResult: ImportResult, showConfigs: boolean) => Promise<void> | void;
   displayFileModifications?: (diff: { file: string; modification: FileModificationResult; }[]) => void,
   displayImportWarning?: (requiresParameters: string[], noParametersRequired: string[]) => void
+  displayInitBanner?: () => void;
+  displayProgress?: () => void;
 }
 
 export class MockReporter implements Reporter {
@@ -27,6 +32,28 @@ export class MockReporter implements Reporter {
     this.config = config ?? null;
   }
 
+  async displayInitBanner(): Promise<void> {
+    this.config?.displayInitBanner?.();
+  }
+
+  async displayProgress(): Promise<void> {
+    this.config?.displayProgress?.();
+  }
+
+  async hide(): Promise<void> {
+    this.config?.hide?.();
+  }
+
+  async promptInitResultSelection(availableTypes: string[]): Promise<string[]> {
+    return (await this.config?.promptInitResultSelection?.(availableTypes)) ?? [];
+  }
+
+  async promptInput(prompt: string, error?: string | undefined, validation?: (() => Promise<boolean>) | undefined, autoComplete?: ((input: string) => string[]) | undefined): Promise<string> {
+    return (await this.config?.promptInput?.(prompt, error, validation)) ?? '';
+  }
+
+  async promptPressKeyToContinue(message?: string | undefined): Promise<void> {}
+
   async displayImportWarning(requiresParameters: string[], noParametersRequired: string[]): Promise<void> {
     console.log('Display import warning');
     console.log(requiresParameters);