codify-plugin-lib 1.0.69 → 1.0.70

package/dist/entities/resource.d.ts

@@ -23,7 +23,7 @@ export declare abstract class Resource<T extends StringIndexedObject> {
     protected schemaValidator?: ValidateFunction;
     protected constructor(options: ResourceOptions<T>);
     onInitialize(): Promise<void>;
-    validateResource(parameters: unknown): Promise<ValidationResult>;
+    validateResource(parameters: Partial<T>): Promise<ValidationResult>;
     plan(desiredConfig: Partial<T> & ResourceConfig | null, currentConfig?: Partial<T> & ResourceConfig | null, statefulMode?: boolean): Promise<Plan<T>>;
     apply(plan: Plan<T>): Promise<void>;
     private _applyCreate;
@@ -35,8 +35,8 @@ export declare abstract class Resource<T extends StringIndexedObject> {
     private refreshNonStatefulParameters;
     private refreshStatefulParameters;
     private validatePlanInputs;
-    validate(parameters: unknown): Promise<ValidationResult>;
-    abstract refresh(values: Map<keyof T, T[keyof T]>): Promise<Partial<T> | null>;
+    validate(parameters: Partial<T>): Promise<ValidationResult>;
+    abstract refresh(values: Partial<T>): Promise<Partial<T> | null>;
     abstract applyCreate(plan: CreatePlan<T>): Promise<void>;
     applyModify(pc: ParameterChange<T>, plan: ModifyPlan<T>): Promise<void>;
     abstract applyDestroy(plan: DestroyPlan<T>): Promise<void>;

package/dist/entities/resource.js

@@ -139,11 +139,11 @@ export class Resource {
         }
         await this.applyDestroy(plan);
     }
-    validateRefreshResults(refresh, desiredMap) {
+    validateRefreshResults(refresh, desired) {
         if (!refresh) {
             return;
         }
-        const desiredKeys = new Set(desiredMap.keys());
+        const desiredKeys = new Set(Object.keys(refresh));
         const refreshKeys = new Set(Object.keys(refresh));
         if (!setsEqual(desiredKeys, refreshKeys)) {
             throw new Error(`Resource ${this.typeId}
@@ -184,9 +184,8 @@ Additional: ${[...refreshKeys].filter(k => !desiredKeys.has(k))};`);
         });
     }
     async refreshNonStatefulParameters(resourceParameters) {
-        const entriesToRefresh = new Map(Object.entries(resourceParameters));
-        const currentParameters = await this.refresh(entriesToRefresh);
-        this.validateRefreshResults(currentParameters, entriesToRefresh);
+        const currentParameters = await this.refresh(resourceParameters);
+        this.validateRefreshResults(currentParameters, resourceParameters);
         return currentParameters;
     }
     async refreshStatefulParameters(statefulParametersConfig, isStatefulMode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.69",
+  "version": "1.0.70",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/entities/errors.ts

@@ -1,6 +1,3 @@
-import { Plan } from './plan.js';
-import { StringIndexedObject } from 'codify-schemas';
-
 export class SudoError extends Error {
   command: string;
 

package/src/entities/plugin.ts

@@ -5,7 +5,6 @@ import {
   PlanRequestData,
   PlanResponseData,
   ResourceConfig,
-  ResourceOperation,
   ValidateRequestData,
   ValidateResponseData
 } from 'codify-schemas';

package/src/entities/resource.ts

@@ -59,7 +59,7 @@ export abstract class Resource<T extends StringIndexedObject> {
 
   async onInitialize(): Promise<void> {}
 
-  async validateResource(parameters: unknown): Promise<ValidationResult> {
+  async validateResource(parameters: Partial<T>): Promise<ValidationResult> {
     if (this.schemaValidator) {
       const isValid = this.schemaValidator(parameters);
 
@@ -215,12 +215,12 @@ export abstract class Resource<T extends StringIndexedObject> {
     await this.applyDestroy(plan as DestroyPlan<T>);
   }
 
-  private validateRefreshResults(refresh: Partial<T> | null, desiredMap: Map<keyof T, T[keyof T]>) {
+  private validateRefreshResults(refresh: Partial<T> | null, desired: Partial<T>) {
     if (!refresh) {
       return;
     }
 
-    const desiredKeys = new Set<keyof T>(desiredMap.keys());
+    const desiredKeys = new Set(Object.keys(refresh)) as Set<keyof T>;
     const refreshKeys = new Set(Object.keys(refresh)) as Set<keyof T>;
 
     if (!setsEqual(desiredKeys, refreshKeys)) {
@@ -278,11 +278,8 @@ Additional: ${[...refreshKeys].filter(k => !desiredKeys.has(k))};`
   }
 
   private async refreshNonStatefulParameters(resourceParameters: Partial<T>): Promise<Partial<T> | null> {
-    const entriesToRefresh = new Map<keyof T, T[keyof T]>(
-      Object.entries(resourceParameters)
-    )
-    const currentParameters = await this.refresh(entriesToRefresh);
-    this.validateRefreshResults(currentParameters, entriesToRefresh);
+    const currentParameters = await this.refresh(resourceParameters);
+    this.validateRefreshResults(currentParameters, resourceParameters);
     return currentParameters;
   }
 
@@ -340,13 +337,13 @@ Additional: ${[...refreshKeys].filter(k => !desiredKeys.has(k))};`
     }
   }
 
-  async validate(parameters: unknown): Promise<ValidationResult> {
+  async validate(parameters: Partial<T>): Promise<ValidationResult> {
     return {
       isValid: true,
     }
   };
 
-  abstract refresh(values: Map<keyof T, T[keyof T]>): Promise<Partial<T> | null>;
+  abstract refresh(values: Partial<T>): Promise<Partial<T> | null>;
 
   abstract applyCreate(plan: CreatePlan<T>): Promise<void>;