Updated codify schemas version to the latest (json schema draft07) and fixed tests

Author: kevinwang5658

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.75",
+  "version": "1.0.76",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -14,7 +14,7 @@
   "dependencies": {
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
-    "codify-schemas": "1.0.44",
+    "codify-schemas": "1.0.45",
     "@npmcli/promise-spawn": "^7.0.1"
   },
   "devDependencies": {

src/entities/resource-options.ts

@@ -1,21 +1,12 @@
 import { StringIndexedObject } from 'codify-schemas';
+
+import { ParameterOptions } from './plan-types.js';
+import { ResourceParameterOptions } from './resource-types.js';
 import { StatefulParameter } from './stateful-parameter.js';
 import { TransformParameter } from './transform-parameter.js';
-import { ResourceParameterOptions } from './resource-types.js';
-import { ParameterOptions } from './plan-types.js';
 
 export interface ResourceOptions<T extends StringIndexedObject> {
 
-  /**
-   * The id of the resource.
-   */
-  type: string;
-
-  /**
-   * Schema to validate user configs with. Must be in the format JSON Schema 2020-12
-   */
-  schema?: unknown
-
   /**
    * If true, statefulParameter.applyRemove() will be called before resource destruction.
    * Defaults to false.
@@ -36,16 +27,26 @@ export interface ResourceOptions<T extends StringIndexedObject> {
     | ResourceStatefulParameterOptions<T>
     | ResourceTransformParameterOptions<T>
   >>
+
+  /**
+   * Schema to validate user configs with. Must be in the format JSON Schema draft07
+   */
+  schema?: unknown
+
+  /**
+   * The id of the resource.
+   */
+  type: string;
 }
 
 export interface ResourceStatefulParameterOptions<T extends StringIndexedObject> {
-  statefulParameter: StatefulParameter<T, T[keyof T]>;
   order?: number;
+  statefulParameter: StatefulParameter<T, T[keyof T]>;
 }
 
 export interface ResourceTransformParameterOptions<T extends StringIndexedObject> {
-  transformParameter: TransformParameter<T>;
   order?: number;
+  transformParameter: TransformParameter<T>;
 }
 
 export class ResourceOptionsParser<T extends StringIndexedObject> {
@@ -90,15 +91,13 @@ export class ResourceOptionsParser<T extends StringIndexedObject> {
     );
 
     const statefulParameters = [...this.statefulParameters.entries()]
-      ?.reduce((obj, sp) => {
-        return {
+      ?.reduce((obj, sp) => ({
           ...obj,
           [sp[0]]: {
             ...sp[1].options,
             isStatefulParameter: true,
           }
-        }
-      }, {} as Record<keyof T, ParameterOptions>)
+        }), {} as Record<keyof T, ParameterOptions>)
 
     return {
       ...resourceParameters,

src/entities/resource.ts

@@ -1,5 +1,4 @@
-import Ajv from 'ajv';
-import Ajv2020, { ValidateFunction } from 'ajv/dist/2020.js';
+import { Ajv, ValidateFunction } from 'ajv';
 import {
   ParameterOperation,
   ResourceConfig,
@@ -38,7 +37,7 @@ export abstract class Resource<T extends StringIndexedObject> {
   readonly options: ResourceOptions<T>;
   readonly defaultValues: Partial<Record<keyof T, unknown>>;
 
-  protected ajv?: Ajv.default;
+  protected ajv?: Ajv;
   protected schemaValidator?: ValidateFunction;
 
   protected constructor(options: ResourceOptions<T>) {
@@ -47,7 +46,7 @@ export abstract class Resource<T extends StringIndexedObject> {
     this.options = options;
 
     if (this.options.schema) {
-      this.ajv = new Ajv2020.default({
+      this.ajv = new Ajv({
         allErrors: true,
         strict: true,
         strictRequired: false,

src/messages/handlers.test.ts

@@ -25,10 +25,13 @@ describe('Message handler tests', () => {
       await handler.onMessage({
         cmd: 'plan',
         data: {
-          type: 'resourceType',
-          name: 'name',
-          prop1: 'A',
-          prop2: 'B',
+          desired: {
+            type: 'resourceType',
+            name: 'name',
+            prop1: 'A',
+            prop2: 'B',
+          },
+          isStateful: false,
         }
       })
     } catch (e) {}
@@ -165,7 +168,10 @@ describe('Message handler tests', () => {
     expect(async () => await handler.onMessage({
       cmd: 'plan',
       data: {
-        type: 'resourceA'
+        desired: {
+          type: 'resourceA'
+        },
+        isStateful: false,
       }
     })).rejects.to.not.throw;
 

src/messages/handlers.ts

@@ -1,4 +1,4 @@
-import Ajv2020, { SchemaObject, ValidateFunction } from 'ajv/dist/2020.js';
+import { Ajv, SchemaObject, ValidateFunction } from 'ajv';
 import addFormats from 'ajv-formats';
 import {
   ApplyRequestDataSchema,
@@ -45,14 +45,14 @@ const SupportedRequests: Record<string, { handler: (plugin: Plugin, data: any) =
 }
 
 export class MessageHandler {
-  private ajv: Ajv2020.default;
+  private ajv: Ajv;
   private readonly plugin: Plugin;
   private messageSchemaValidator: ValidateFunction;
   private requestValidators: Map<string, ValidateFunction>;
   private responseValidators: Map<string, ValidateFunction>;
 
   constructor(plugin: Plugin) {
-    this.ajv = new Ajv2020.default({ strict: true, strictRequired: false });
+    this.ajv = new Ajv({ strict: true, strictRequired: false });
     addFormats.default(this.ajv);
     this.ajv.addSchema(ResourceSchema);
     this.plugin = plugin;