fix: Fixed tests and bug fixes

kevinwang5658 · kevinwang5658 · commit df7619374c20 · 2025-02-21T11:44:19.000-05:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "@types/semver": "^7.5.4",
     "@types/strip-ansi": "^5.2.1",
     "@typescript-eslint/eslint-plugin": "^8.16.0",
-    "codify-plugin-lib": "^1.0.140",
+    "codify-plugin-lib": "^1.0.151",
     "esbuild": "^0.24.0",
     "esbuild-plugin-copy": "^2.1.1",
     "eslint": "^8.51.0",
diff --git a/src/entities/resource-info.ts b/src/entities/resource-info.ts
@@ -20,9 +20,7 @@ export class ResourceInfo implements GetResourceInfoResponseData {
     requiredParameters: null | string[];
   } | undefined;
 
-  allowMultiple?: {
-    identifyingParameters: string[];
-  };
+  allowMultiple!: boolean;
 
   private parametersCache?: ParameterInfo[];
 
diff --git a/src/orchestrators/destroy.ts b/src/orchestrators/destroy.ts
@@ -50,6 +50,10 @@ export class DestroyOrchestrator {
     const plan = await ctx.subprocess(ProcessName.PLAN, () =>
       pluginManager.plan(uninstallProject)
     )
+
+    plan.sortByEvalOrder(project.evaluationOrder);
+    uninstallProject.removeNoopFromEvaluationOrder(plan);
+
     reporter.displayPlan(plan);
 
     // Short circuit and exit if every change is NOOP
diff --git a/src/plugins/plugin-manager.ts b/src/plugins/plugin-manager.ts
@@ -198,11 +198,35 @@ export class PluginManager {
 
   /** Clean up any stranglers and child processes if the CLI is killed */
   private registerKillListeners(plugins: Plugin[]) {
-    const kill = (code) => {
+    const kill = (code: number | string) => {
       plugins.forEach((p) => {
         p.kill()
       })
-      process.exit(code);
+
+      let exitCode = 0;
+      switch (code) {
+        case 'SIGTERM': {
+          exitCode = 143;
+          break;
+        }
+
+        case 'SIGHUP': {
+          exitCode = 129;
+          break;
+        }
+
+        case 'SIGINT': {
+          exitCode = 130;
+          break;
+        }
+      }
+      
+      const parsedCode = typeof code === 'string' ? Number.parseInt(code, 10) : code;
+      if (Number.isInteger(parsedCode)) {
+        exitCode = parsedCode;
+      }
+
+      process.exit(exitCode);
     }
 
     process.on('exit', kill)
diff --git a/src/plugins/plugin.ts b/src/plugins/plugin.ts
@@ -31,9 +31,11 @@ export interface IPlugin {
   initialize(secureMode: boolean): Promise<InitializeResponseData>;
   validate(configs: ResourceConfig[]): Promise<ValidateResponseData>;
   getResourceInfo(type: string): Promise<GetResourceInfoResponseData>;
+  match(resource: ResourceConfig, array: ResourceConfig[]): Promise<MatchResponseData>;
   import(config: ResourceJson): Promise<ImportResponseData>;
   plan(request: PlanRequestData): Promise<ResourcePlan>;
   apply(plan: ResourcePlan): Promise<void>;
+  kill(): void;
 }
 
 export class Plugin implements IPlugin {
diff --git a/src/utils/file-modification-calculator.test.ts b/src/utils/file-modification-calculator.test.ts
@@ -52,7 +52,7 @@ describe('File modification calculator tests', () => {
     const result = await calculator.calculate([{
       modification: ModificationType.INSERT_OR_UPDATE,
       resource: modifiedResource,
-    }])
+    }], match)
 
     console.log(result)
     console.log(result.diff)
@@ -89,7 +89,7 @@ describe('File modification calculator tests', () => {
     const result = await calculator.calculate([{
       modification: ModificationType.DELETE,
       resource: modifiedResource,
-    }])
+    }], match)
 
     expect(result.newFile).to.eq('[\n' +
       '  {\n' +
@@ -134,7 +134,7 @@ describe('File modification calculator tests', () => {
     const result = await calculator.calculate([{
       modification: ModificationType.DELETE,
       resource: modifiedResource,
-    }])
+    }], match)
 
     expect(result.newFile).to.eq('[\n' +
       '  {\n' +
@@ -175,7 +175,7 @@ describe('File modification calculator tests', () => {
     const result = await calculator.calculate([{
       modification: ModificationType.DELETE,
       resource: modifiedResource,
-    }])
+    }], match)
 
     expect(result.newFile).to.eq('[\n' +
       '  { "type": "resource2", "param2": ["a", "b", "c"] },\n' +
@@ -221,7 +221,7 @@ describe('File modification calculator tests', () => {
     const result = await calculator.calculate([{
       modification: ModificationType.INSERT_OR_UPDATE,
       resource: modifiedResource,
-    }])
+    }], match)
 
     expect(result.newFile).to.eq('[\n' +
       '  {\n' +
@@ -298,7 +298,7 @@ describe('File modification calculator tests', () => {
     const result = await calculator.calculate([{
       modification: ModificationType.INSERT_OR_UPDATE,
       resource: modifiedResource,
-    }])
+    }], match)
 
     expect(result.newFile).to.eq('[\n' +
       '  {\n' +
@@ -356,7 +356,7 @@ describe('File modification calculator tests', () => {
     const result = await calculator.calculate([{
       modification: ModificationType.INSERT_OR_UPDATE,
       resource: modifiedResource,
-    }])
+    }], match)
 
     expect(result.newFile).to.eq('[\n' +
       '  {\n' +
@@ -415,7 +415,7 @@ describe('File modification calculator tests', () => {
     }, {
       modification: ModificationType.INSERT_OR_UPDATE,
       resource: modifiedResource2,
-    }])
+    }], match)
 
     expect(result.newFile).to.eq('[\n' +
       '  {\n' +
@@ -491,7 +491,7 @@ describe('File modification calculator tests', () => {
     const result = await calculator.calculate([{
       modification: ModificationType.INSERT_OR_UPDATE,
       resource: modifiedResource,
-    }])
+    }], match)
 
     // TODO: The result is currently wrong need to fix
     console.log(result);
@@ -522,6 +522,10 @@ describe('File modification calculator tests', () => {
   })
 })
 
+async function match(resource: ResourceConfig, array: ResourceConfig[]): Promise<number> {
+  return array.findIndex((r) => resource.isSame(r.type, r.name));
+}
+
 function generateResourceInfo(type: string, requiredParameters?: string[]): ResourceInfo {
   return ResourceInfo.fromResponseData({
     plugin: 'plugin',
diff --git a/src/utils/file-modification-calculator.ts b/src/utils/file-modification-calculator.ts
@@ -232,7 +232,11 @@ export class FileModificationCalculator {
       const source = sourceMap.lookup(`/${sourceIndex}/${key}`);
       if ((Array.isArray(value) || typeof value === 'object') && source && source.value.line === source.valueEnd.line) {
         const { value, valueEnd } = parsedSourceMap.lookup(`#/${key}`)!
-        content = this.splice(content, value.position, valueEnd.position - value.position, JSON.stringify(parsedContent[key], null, ' '))
+        content = this.splice(
+          content,
+          value.position, valueEnd.position - value.position,
+          JSON.stringify(parsedContent[key]).replaceAll('\n', '').replaceAll(/}$/g, ' }')
+        )
       }
     }
 
diff --git a/test/orchestrator/apply/apply.test.ts b/test/orchestrator/apply/apply.test.ts
@@ -89,7 +89,7 @@ describe('Apply orchestrator tests', () => {
     expect(MockOs.get('xcode-tools')).toMatchObject({})
   });
 
-  it('Can apply a resource (recreate)', async () => {
+  it('Can apply a resource (re-create)', async () => {
     const reporter = new MockReporter({
       validatePlan(plan: Plan) {
         // As always these values are from recreate.codify.json
@@ -99,8 +99,8 @@ describe('Apply orchestrator tests', () => {
             expect.objectContaining({
               name: 'propA',
               previousValue: 'current',
-              newValue: 'newPropA',
-              operation: 'modify'
+              newValue: 'current',
+              operation: 'noop'
             }),
             expect.objectContaining({
               name: 'propB',
@@ -139,7 +139,7 @@ describe('Apply orchestrator tests', () => {
     }, reporter)
 
     expect(MockOs.get('mock')).to.toMatchObject({
-      propA: 'newPropA',
+      propA: 'current',
       propB: 0,
       array: ['a', 'b'],
       directory: '/home'
diff --git a/test/orchestrator/apply/recreate.codify.json b/test/orchestrator/apply/recreate.codify.json
@@ -1,4 +1,4 @@
 [
   { "type": "project", "plugins": { "default": "./test/orchestrator/mocks/plugin.ts" } },
-  { "type":  "mock", "propA": "newPropA", "propB": 0, "directory": "/home", "array": ["a", "b"] }
+  { "type":  "mock", "propA": "current", "propB": 0, "directory": "/home", "array": ["a", "b"] }
 ]
diff --git a/test/orchestrator/destroy/codify.json b/test/orchestrator/destroy/codify.json
@@ -1,5 +1,5 @@
 [
   { "type": "project", "plugins": { "default": "./test/orchestrator/mocks/plugin.ts" } },
-  { "type":  "mock", "propA": "abc", "propB": 123, "directory": "~/home" },
+  { "type":  "mock", "propA": "current", "propB": 123, "directory": "~/home" },
   { "type":  "mock", "propA": "abc", "propB": 12, "directory": "~/home" }
 ]
diff --git a/test/orchestrator/destroy/destroy.test.ts b/test/orchestrator/destroy/destroy.test.ts
@@ -6,20 +6,37 @@ import { MockOs } from '../mocks/system.js';
 import { Plan } from '../../../src/entities/plan.js';
 import { ResourceOperation } from 'codify-schemas';
 import { MockReporter } from '../mocks/reporter.js';
+import { MockResource, MockResourceConfig } from '../mocks/resource';
+import { ResourceSettings } from 'codify-plugin-lib';
+
+vi.mock('../mocks/get-mock-resources.js', async () => {
+  return {
+    getMockResources: () => ([
+      new class extends MockResource {
+        getSettings(): ResourceSettings<MockResourceConfig> {
+          const orgSettings = super.getSettings();
+          return {
+            ...orgSettings,
+            allowMultiple: {
+              identifyingParameters: ['propA'],
+            }
+          }
+        }
+      }
+    ])
+  }
+})
 
 vi.mock('../../../src/plugins/plugin.js', async () => {
   const { MockPlugin } = await import('../mocks/plugin.js');
   return { Plugin: MockPlugin };
 })
 
 describe('Destroy orchestrator tests', () => {
-  it('Can destroy a resource (simple, no required attributes, from Codify.json)', async () => {
+  it('Can destroy a resource', async () => {
     const reporter = new MockReporter({
       validatePlan(plan: Plan) {
-        expect(plan.getResourcePlan('mock.0')).toMatchObject({
-          operation: ResourceOperation.DESTROY,
-        });
-        expect(plan.getResourcePlan('mock.1')).toMatchObject({
+        expect(plan.getResourcePlan('mock')).toMatchObject({
           operation: ResourceOperation.DESTROY,
         });
       }
@@ -36,7 +53,7 @@ describe('Destroy orchestrator tests', () => {
 
     await DestroyOrchestrator.run({
       ids: ['mock'],
-      path: path.join(__dirname, 'codify.json')
+      path: path.join(__dirname, 'simple.codify.json')
     }, reporter)
 
     expect(MockOs.get('mock')).to.be.undefined;
@@ -73,7 +90,7 @@ describe('Destroy orchestrator tests', () => {
     });
 
     MockOs.create('mock', {
-      propA: 'current',
+      propA: 'current', // This is the identifying parameter and it matches the config
       propB: 1,
       array: ['a', 'b', 'c'],
       directory: '~/home'
diff --git a/test/orchestrator/destroy/simple.codify.json b/test/orchestrator/destroy/simple.codify.json
@@ -0,0 +1,4 @@
+[
+  { "type": "project", "plugins": { "default": "./test/orchestrator/mocks/plugin.ts" } },
+  { "type":  "mock", "propA": "current", "propB": 123, "directory": "~/home" }
+]
diff --git a/test/orchestrator/import/import.test.ts b/test/orchestrator/import/import.test.ts
@@ -90,7 +90,8 @@ vi.mock('../mocks/get-mock-resources.js', async () => {
             importAndDestroy: {
               requiredParameters: ['alias'],
               refreshKeys: ['alias', 'value'],
-            }
+            },
+            allowMultiple: true,
           }
         }
       }
@@ -183,7 +184,7 @@ describe('Import orchestrator tests', () => {
     expect(displayFileModifications).toHaveBeenCalledOnce();
     expect(promptConfirmationSpy).toHaveBeenCalledOnce();
 
-    const fileWritten = fs.readFileSync('/import.codify.json', 'utf8') as string;
+    const fileWritten = fs.readFileSync('/codify-imports/import.codify.json', 'utf8') as string;
     console.log(fileWritten);
 
     expect(JSON.parse(fileWritten)).toMatchObject([
diff --git a/test/orchestrator/mocks/plugin.ts b/test/orchestrator/mocks/plugin.ts
@@ -1,6 +1,8 @@
 import { Plugin as PluginLibrary } from 'codify-plugin-lib'
 import { GetResourceInfoResponseData, ImportResponseData, InitializeResponseData,
-  PlanRequestData, ResourceJson, ValidateResponseData } from 'codify-schemas';
+  MatchResponseData,
+  PlanRequestData, ResourceJson, ValidateResponseData
+} from 'codify-schemas';
 
 import { ResourcePlan } from '../../../src/entities/plan.js';
 import { ResourceConfig } from '../../../src/entities/resource-config.js';
@@ -30,6 +32,10 @@ export class MockPlugin implements IPlugin {
     return this.plugin.getResourceInfo({ type });
   }
 
+  async match(resource: ResourceConfig, array: ResourceConfig[]): Promise<MatchResponseData> {
+    return this.plugin.match({ resource: resource.toJson(), array: array.map((r) => r.toJson()) });
+  }
+
   async import(config: ResourceJson): Promise<ImportResponseData> {
     return this.plugin.import(config)
   }
@@ -43,5 +49,8 @@ export class MockPlugin implements IPlugin {
   async apply(plan: ResourcePlan): Promise<void> {
     await this.plugin.apply({ plan })
   }
-  
+
+  kill(): void {
+
+  }
 }
diff --git a/test/orchestrator/mocks/resource.ts b/test/orchestrator/mocks/resource.ts
@@ -25,6 +25,9 @@ export class MockResource extends Resource<MockResourceConfig> {
       importAndDestroy: {
         requiredParameters: ['propB'],
         refreshKeys: ['propB', 'directory'],
+      },
+      allowMultiple: {
+        identifyingParameters: ['propA']
       }
     }
   }
diff --git a/test/orchestrator/plan/plan.test.ts b/test/orchestrator/plan/plan.test.ts
diff --git a/test/orchestrator/plan/recreate.codify.json b/test/orchestrator/plan/recreate.codify.json

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,11 @@ export class FileModificationCalculator {`
`232`	`232`	const source = sourceMap.lookup(`/${sourceIndex}/${key}`);
`233`	`233`	`if ((Array.isArray(value) \|\| typeof value === 'object') && source && source.value.line === source.valueEnd.line) {`
`234`	`234`	const { value, valueEnd } = parsedSourceMap.lookup(`#/${key}`)!
`235`		`- content = this.splice(content, value.position, valueEnd.position - value.position, JSON.stringify(parsedContent[key], null, ' '))`
	`235`	`+ content = this.splice(`
	`236`	`+ content,`
	`237`	`+ value.position, valueEnd.position - value.position,`
	`238`	`+ JSON.stringify(parsedContent[key]).replaceAll('\n', '').replaceAll(/}$/g, ' }')`
	`239`	`+ )`
`236`	`240`	`}`
`237`	`241`	`}`
`238`	`242`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`[`
`2`	`2`	`{ "type": "project", "plugins": { "default": "./test/orchestrator/mocks/plugin.ts" } },`
`3`		`- { "type": "mock", "propA": "newPropA", "propB": 0, "directory": "/home", "array": ["a", "b"] }`
	`3`	`+ { "type": "mock", "propA": "current", "propB": 0, "directory": "/home", "array": ["a", "b"] }`
`4`	`4`	`]`