feat: Updated to latest schemas which separates core and parameters

Author: kevinwang5658

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-test",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -15,7 +15,7 @@
   "dependencies": {
     "ajv": "^8.12.0",
     "ajv-formats": "^3.0.1",
-    "codify-schemas": "1.0.54",
+    "codify-schemas": "1.0.61",
     "lodash.matches": "^4.6.0",
     "lodash.differencewith": "4.5.0",
     "lodash.unionby": "^4.8.0",
@@ -36,7 +36,7 @@
     "tsx": "^4.7.3",
     "typescript": "^5",
     "vitest": "^1.4.0",
-    "codify-plugin-lib": "1.0.117"
+    "codify-plugin-lib": "1.0.130"
   },
   "engines": {
     "node": ">=18.0.0"

src/plugin-tester.ts

@@ -8,6 +8,7 @@ import {
 import unionBy from 'lodash.unionby';
 
 import { PluginProcess } from './plugin-process.js';
+import { splitUserConfig } from './utils.js';
 
 export class PluginTester {
   static async fullTest(
@@ -45,7 +46,10 @@ export class PluginTester {
       }
 
       console.info(chalk.cyan('Testing validate...'))
-      const validate = await plugin.validate({ configs });
+      const validate = await plugin.validate({ configs: configs.map((c) => {
+        const { coreParameters, parameters } = splitUserConfig(c)
+        return { core: coreParameters, parameters };
+      }) });
 
       const invalidConfigs = validate.resourceValidations.filter((v) => !v.isValid)
       if (invalidConfigs.length > 0) {
@@ -55,8 +59,11 @@ export class PluginTester {
       console.info(chalk.cyan('Testing plan...'))
       const plans = [];
       for (const config of configs) {
+        const { coreParameters, parameters } = splitUserConfig(config);
+        
         plans.push(await plugin.plan({
-          desired: config,
+          core: coreParameters,
+          desired: parameters,
           isStateful: false,
           state: undefined,
         }));
@@ -86,7 +93,9 @@ export class PluginTester {
 
       const importResults = [];
       for (const config of configs) {
-        const importResult = await importPlugin.import({ config })
+        const { coreParameters, parameters } = splitUserConfig(config);
+        
+        const importResult = await importPlugin.import({ core: coreParameters, parameters })
         importResults.push(importResult);
       }
 
@@ -105,8 +114,11 @@ export class PluginTester {
 
         const modifyPlans = [];
         for (const config of options.testModify.modifiedConfigs) {
+          const { coreParameters, parameters } = splitUserConfig(config);
+          
           modifyPlans.push(await modifyPlugin.plan({
-            desired: config,
+            core: coreParameters,
+            desired: parameters,
             isStateful: false,
             state: undefined,
           }));
@@ -153,9 +165,12 @@ ${JSON.stringify(modifyPlans, null, 2)}`)
 
       const plans = [];
       for (const config of configs) {
+        const { coreParameters, parameters } = splitUserConfig(config);
+        
         plans.push(await destroyPlugin.plan({
+          core: coreParameters,
           isStateful: true,
-          state: config,
+          state: parameters,
           desired: undefined
         }))
       }

src/utils.ts

@@ -0,0 +1,19 @@
+import { ResourceConfig, StringIndexedObject } from 'codify-schemas';
+
+export function splitUserConfig<T extends StringIndexedObject>(
+  config: ResourceConfig & T
+): { parameters: T; coreParameters: ResourceConfig } {
+  const coreParameters = {
+    type: config.type,
+    ...(config.name ? { name: config.name } : {}),
+    ...(config.dependsOn ? { dependsOn: config.dependsOn } : {}),
+  };
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { type, name, dependsOn, ...parameters } = config;
+
+  return {
+    parameters: parameters as T,
+    coreParameters,
+  };
+}

test/plugin-tester.test.ts

@@ -41,10 +41,14 @@ describe('Plugin tester integration tests', () => {
   it('Can validate a config', async () => {
     const result = await plugin.validate({
       configs: [{
-        type: 'test',
-        propA: 'a',
-        propB: 2,
-        propC: 'c',
+        core: {
+          type: 'test',
+        },
+        parameters: {
+          propA: 'a',
+          propB: 2,
+          propC: 'c',
+        }
       }]
     })
 
@@ -55,8 +59,10 @@ describe('Plugin tester integration tests', () => {
 
   it('Can generate a plan', async () => {
     const result = await plugin.plan({
-      desired: {
+      core: {
         type: 'test',
+      },
+      desired: {
         propA: 'a',
         propB: 10,
         propC: 'c',
@@ -74,8 +80,10 @@ describe('Plugin tester integration tests', () => {
 
   it('Can generate a plan', async () => {
     const result = await plugin.plan({
-      desired: {
+      core: {
         type: 'test',
+      },
+      desired: {
         propA: 'a',
         propB: 10,
         propC: 'c',
@@ -93,8 +101,10 @@ describe('Plugin tester integration tests', () => {
 
   it('Can apply a plan', async () => {
     const plan = await plugin.plan({
-      desired: {
+      core: {
         type: 'test',
+      },
+      desired: {
         propA: 'a',
         propB: 10,
         propC: 'c',
@@ -109,8 +119,10 @@ describe('Plugin tester integration tests', () => {
 
   it('Handles errors that are thrown', async () => {
     expect(async () => plugin.plan({
-      desired: {
+      core: {
         type: 'test',
+      },
+      desired: {
         propA: 'a',
         propB: 10,
         propC: 'c',