codify-plugin-lib 1.0.39 → 1.0.41

package/dist/entities/change-set.js

@@ -79,7 +79,7 @@ export class ChangeSet {
                 delete _current[k];
                 continue;
             }
-            if (!ChangeSet.isSame(_current[k], _desired[k], parameterConfigurations?.[k]?.isEqual)) {
+            if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k]?.isEqual)) {
                 parameterChangeSet.push({
                     name: k,
                     previousValue: v,
@@ -126,7 +126,7 @@ export class ChangeSet {
                 });
                 continue;
             }
-            if (!ChangeSet.isSame(_current[k], _desired[k], parameterConfigurations?.[k]?.isEqual)) {
+            if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k]?.isEqual)) {
                 parameterChangeSet.push({
                     name: k,
                     previousValue: _current[k],

package/dist/entities/plan-types.d.ts

@@ -1,8 +1,7 @@
 import { ResourceOperation } from 'codify-schemas';
 export interface ParameterConfiguration {
     planOperation?: ResourceOperation.MODIFY | ResourceOperation.RECREATE;
-    isEqual?: (a: any, b: any) => boolean;
-    isArrayElementEqual?: (a: any, b: any) => boolean;
+    isEqual?: (desired: any, current: any) => boolean;
     isStatefulParameter?: boolean;
 }
 export interface PlanConfiguration<T> {

package/dist/entities/resource-types.d.ts

@@ -4,7 +4,7 @@ import { Resource } from './resource.js';
 export type ErrorMessage = string;
 export interface ResourceParameterConfiguration {
     planOperation?: ResourceOperation.MODIFY | ResourceOperation.RECREATE;
-    isEqual?: (a: any, b: any) => boolean;
+    isEqual?: (desired: any, current: any) => boolean;
 }
 export interface ResourceConfiguration<T extends StringIndexedObject> {
     type: string;

package/dist/entities/resource.js

@@ -32,20 +32,19 @@ export class Resource {
             .filter((sp) => desiredParameters[sp.name] !== undefined);
         const keysToRefresh = new Set(Object.keys(resourceParameters));
         const currentParameters = await this.refresh(keysToRefresh);
-        if (currentParameters == null && statefulParameters.length === 0) {
+        if (currentParameters == null) {
             return Plan.create(desiredConfig, null, planConfiguration);
         }
         this.validateRefreshResults(currentParameters, keysToRefresh);
-        const currentStatefulParameters = {};
         for (const statefulParameter of statefulParameters) {
             const desiredValue = desiredParameters[statefulParameter.name];
             let currentValue = await statefulParameter.refresh(desiredValue ?? null) ?? undefined;
             if (Array.isArray(currentValue) && Array.isArray(desiredValue) && !planConfiguration.statefulMode) {
                 currentValue = currentValue.filter((p) => desiredValue?.includes(p));
             }
-            currentStatefulParameters[statefulParameter.name] = currentValue;
+            currentParameters[statefulParameter.name] = currentValue;
         }
-        return Plan.create(desiredConfig, { ...currentParameters, ...currentStatefulParameters, ...resourceMetadata }, planConfiguration);
+        return Plan.create(desiredConfig, { ...currentParameters, ...resourceMetadata }, planConfiguration);
     }
     async apply(plan) {
         if (plan.getResourceType() !== this.typeId) {

package/package.json

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

package/src/entities/change-set.ts

@@ -130,7 +130,7 @@ export class ChangeSet<T extends StringIndexedObject> {
         continue;
       }
 
-      if (!ChangeSet.isSame(_current[k], _desired[k], parameterConfigurations?.[k]?.isEqual)) {
+      if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k]?.isEqual)) {
         parameterChangeSet.push({
           name: k,
           previousValue: v,
@@ -194,7 +194,7 @@ export class ChangeSet<T extends StringIndexedObject> {
         continue;
       }
 
-      if (!ChangeSet.isSame(_current[k], _desired[k], parameterConfigurations?.[k]?.isEqual)) {
+      if (!ChangeSet.isSame(_desired[k], _current[k], parameterConfigurations?.[k]?.isEqual)) {
         parameterChangeSet.push({
           name: k,
           previousValue: _current[k],

package/src/entities/plan-types.ts

@@ -13,9 +13,7 @@ export interface ParameterConfiguration {
    * @param a
    * @param b
    */
-  isEqual?: (a: any, b: any) => boolean;
-
-  isArrayElementEqual?: (a: any, b: any) => boolean;
+  isEqual?: (desired: any, current: any) => boolean;
 
   isStatefulParameter?: boolean;
 }

package/src/entities/resource-parameters.test.ts

@@ -113,7 +113,7 @@ describe('Resource parameters tests', () => {
       }
 
       async refresh(): Promise<Partial<TestConfig> | null> {
-        return null;
+        return {};
       }
     }
 
@@ -144,7 +144,7 @@ describe('Resource parameters tests', () => {
       }
 
       async refresh(): Promise<Partial<TestConfig> | null> {
-        return null;
+        return {};
       }
     }
 

package/src/entities/resource-types.ts

@@ -14,10 +14,10 @@ export interface ResourceParameterConfiguration {
   planOperation?: ResourceOperation.MODIFY | ResourceOperation.RECREATE;
   /**
    * Customize the equality comparison for a parameter.
-   * @param a
-   * @param b
+   * @param desired
+   * @param current
    */
-  isEqual?: (a: any, b: any) => boolean;
+  isEqual?: (desired: any, current: any) => boolean;
 }
 
 /**

package/src/entities/resource.ts

@@ -64,7 +64,8 @@ export abstract class Resource<T extends StringIndexedObject> {
     const keysToRefresh = new Set(Object.keys(resourceParameters));
     const currentParameters = await this.refresh(keysToRefresh);
 
-    if (currentParameters == null && statefulParameters.length === 0) {
+    // Short circuit here. If resource is non-existent, then there's no point checking stateful parameters
+    if (currentParameters == null) {
       return Plan.create(desiredConfig, null, planConfiguration);
     }
 
@@ -72,8 +73,6 @@ export abstract class Resource<T extends StringIndexedObject> {
 
     // Refresh stateful parameters
     // This refreshes parameters that are stateful (they can be added, deleted separately from the resource)
-    const currentStatefulParameters = {} as Partial<T>;
-
     for(const statefulParameter of statefulParameters) {
       const desiredValue = desiredParameters[statefulParameter.name];
 
@@ -84,12 +83,12 @@ export abstract class Resource<T extends StringIndexedObject> {
         currentValue = currentValue.filter((p) => desiredValue?.includes(p)) as any;
       }
 
-      currentStatefulParameters[statefulParameter.name] = currentValue;
+      currentParameters[statefulParameter.name] = currentValue;
     }
 
     return Plan.create(
       desiredConfig,
-      { ...currentParameters, ...currentStatefulParameters, ...resourceMetadata } as Partial<T> & ResourceConfig,
+      { ...currentParameters, ...resourceMetadata } as Partial<T> & ResourceConfig,
       planConfiguration,
     )
   }