Updated to use the latest API schemas

Author: kevinwang5658

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-test",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "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.42"
+    "codify-schemas": "1.0.45"
   },
   "devDependencies": {
     "@oclif/prettier-config": "^0.2.1",
@@ -28,7 +28,7 @@
     "tsx": "^4.7.3",
     "typescript": "^5",
     "vitest": "^1.4.0",
-    "codify-plugin-lib": "1.0.73"
+    "codify-plugin-lib": "1.0.76"
   },
   "engines": {
     "node": ">=18.0.0"

src/plugin-tester.ts

@@ -1,4 +1,4 @@
-import Ajv2020 from 'ajv/dist/2020.js';
+import Ajv from 'ajv';
 import {
   ApplyRequestData,
   InitializeResponseData,
@@ -20,7 +20,7 @@ import path from 'node:path';
 
 import { CodifyTestUtils } from './test-utils.js';
 
-const ajv = new Ajv2020.default({
+const ajv = new Ajv.default({
   strict: true
 });
 const ipcMessageValidator = ajv.compile(IpcMessageSchema);
@@ -72,7 +72,11 @@ export class PluginTester {
 
     const plans = [];
     for (const config of configs) {
-      plans.push(await this.plan(config));
+      plans.push(await this.plan({
+        desired: config,
+        isStateful: false,
+        state: undefined,
+      }));
     }
 
     if (assertPlans) {
@@ -88,7 +92,11 @@ export class PluginTester {
     // Check that all applys were successful by re-planning
     const validationPlans = [];
     for (const config of configs) {
-      validationPlans.push(await this.plan(config));
+      validationPlans.push(await this.plan({
+        desired: config,
+        isStateful: false,
+        state: undefined,
+      }));
     }
 
     const unsuccessfulPlans = validationPlans.filter((p) => p.operation !== ResourceOperation.NOOP);
@@ -117,7 +125,11 @@ ${JSON.stringify(unsuccessfulPlans, null, 2)}`
       });
 
       // Validate that the destroy was successful
-      const validationPlan = await this.plan(config);
+      const validationPlan = await this.plan({
+        desired: config,
+        state: undefined,
+        isStateful: false,
+      });
       if (validationPlan.operation !== ResourceOperation.CREATE) {
         throw new Error(`Resource ${type} was not successfully destroyed.
 Validation plan shows:

src/test-utils.ts

@@ -1,8 +1,8 @@
-import Ajv2020 from 'ajv/dist/2020.js';
+import Ajv from 'ajv';
 import { IpcMessage, IpcMessageSchema, MessageStatus } from 'codify-schemas';
 import { ChildProcess } from 'node:child_process';
 
-const ajv = new Ajv2020.default({
+const ajv = new Ajv.default({
   strict: true
 });
 const ipcMessageValidator = ajv.compile(IpcMessageSchema);

test/plugin-tester.test.ts

@@ -36,10 +36,14 @@ describe('Plugin tester integration tests', () => {
     const plugin = new PluginTester(path.join(__dirname, './test-plugin.ts'));
 
     const result = await plugin.plan({
-      type: 'test',
-      propA: 'a',
-      propB: 10,
-      propC: 'c',
+      desired: {
+        type: 'test',
+        propA: 'a',
+        propB: 10,
+        propC: 'c',
+      },
+      state: undefined,
+      isStateful: false,
     })
 
     expect(result).toMatchObject({
@@ -53,10 +57,14 @@ describe('Plugin tester integration tests', () => {
     const plugin = new PluginTester(path.join(__dirname, './test-plugin.ts'));
 
     const result = await plugin.plan({
-      type: 'test',
-      propA: 'a',
-      propB: 10,
-      propC: 'c',
+      desired: {
+        type: 'test',
+        propA: 'a',
+        propB: 10,
+        propC: 'c',
+      },
+      state: undefined,
+      isStateful: false,
     })
 
     expect(result).toMatchObject({
@@ -70,10 +78,14 @@ describe('Plugin tester integration tests', () => {
     const plugin = new PluginTester(path.join(__dirname, './test-plugin.ts'));
 
     const plan = await plugin.plan({
-      type: 'test',
-      propA: 'a',
-      propB: 10,
-      propC: 'c',
+      desired: {
+        type: 'test',
+        propA: 'a',
+        propB: 10,
+        propC: 'c',
+      },
+      state: undefined,
+      isStateful: false,
     })
 
     // No expect needed here. This passes if it doesn't throw.
@@ -84,11 +96,15 @@ describe('Plugin tester integration tests', () => {
     const plugin = new PluginTester(path.join(__dirname, './test-plugin.ts'));
 
     expect(async () => plugin.plan({
-      type: 'test',
-      propA: 'a',
-      propB: 10,
-      propC: 'c',
-      propD: 'any'
+      desired: {
+        type: 'test',
+        propA: 'a',
+        propB: 10,
+        propC: 'c',
+        propD: 'any'
+      },
+      state: undefined,
+      isStateful: false,
     })).rejects.toThrowError(new Error('Prop D is included'));
   })