codify-plugin-lib 1.0.14 → 1.0.16

package/dist/entities/change-set.d.ts

@@ -12,4 +12,5 @@ export declare class ChangeSet {
     static createForNullCurrentConfig(desiredConfig: ResourceConfig): ChangeSet;
     static calculateParameterChangeSet(prev: ResourceConfig, next: ResourceConfig): ParameterChange[];
     static combineResourceOperations(prev: ResourceOperation, next: ResourceOperation): ResourceOperation;
+    static isSame(a: unknown, b: unknown): boolean;
 }

package/dist/entities/change-set.js

@@ -39,7 +39,7 @@ class ChangeSet {
                 delete filteredPrev[k];
                 continue;
             }
-            if (filteredPrev[k] !== filteredNext[k]) {
+            if (!ChangeSet.isSame(filteredPrev[k], filteredNext[k])) {
                 parameterChangeSet.push({
                     name: k,
                     previousValue: v,
@@ -84,5 +84,13 @@ class ChangeSet {
         const indexNext = orderOfOperations.indexOf(next);
         return orderOfOperations[Math.max(indexPrev, indexNext)];
     }
+    static isSame(a, b) {
+        if (Array.isArray(a) && Array.isArray(b)) {
+            const sortedPrev = a.map((x) => x).sort();
+            const sortedNext = b.map((x) => x).sort();
+            return JSON.stringify(sortedPrev) === JSON.stringify(sortedNext);
+        }
+        return a === b;
+    }
 }
 exports.ChangeSet = ChangeSet;

package/dist/entities/resource.d.ts

@@ -8,8 +8,8 @@ export declare abstract class Resource<T extends ResourceConfig> {
     onInitialize(): Promise<void>;
     plan(desiredConfig: T): Promise<Plan<T>>;
     apply(plan: Plan<T>): Promise<void>;
-    abstract validate(config: ResourceConfig): Promise<boolean>;
-    abstract getCurrentConfig(): Promise<T | null>;
+    abstract validate(config: unknown): Promise<boolean>;
+    abstract getCurrentConfig(desiredConfig: T): Promise<T | null>;
     abstract calculateOperation(change: ParameterChange): ResourceOperation.MODIFY | ResourceOperation.RECREATE;
     abstract applyCreate(plan: Plan<T>): Promise<void>;
     abstract applyModify(plan: Plan<T>): Promise<void>;

package/dist/entities/resource.js

@@ -12,7 +12,7 @@ class Resource {
     async onInitialize() { }
     async plan(desiredConfig) {
         await this.validate(desiredConfig);
-        const currentConfig = await this.getCurrentConfig();
+        const currentConfig = await this.getCurrentConfig(desiredConfig);
         if (!currentConfig) {
             return plan_1.Plan.create(change_set_1.ChangeSet.createForNullCurrentConfig(desiredConfig), desiredConfig);
         }

package/package.json

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

package/src/entities/change-set.test.ts

@@ -74,6 +74,38 @@ describe('Change set tests', () => {
     expect(cs[0].operation).to.eq(ParameterOperation.NOOP);
   })
 
+  it ('handles simple arrays', () => {
+    const before = {
+      type: 'config',
+      propA: ['a', 'b', 'c'],
+    }
+
+    const after = {
+      type: 'config',
+      propA: ['b', 'a', 'c'],
+    }
+
+    const cs = ChangeSet.calculateParameterChangeSet(before, after);
+    expect(cs.length).to.eq(1);
+    expect(cs[0].operation).to.eq(ParameterOperation.NOOP);
+  })
+
+  it ('handles simple arrays', () => {
+    const before = {
+      type: 'config',
+      propA: ['a', 'b'],
+    }
+
+    const after = {
+      type: 'config',
+      propA: ['b', 'a', 'c'],
+    }
+
+    const cs = ChangeSet.calculateParameterChangeSet(before, after);
+    expect(cs.length).to.eq(1);
+    expect(cs[0].operation).to.eq(ParameterOperation.MODIFY);
+  })
+
   it ('determines the order of operations 1', () => {
     const op1 = ResourceOperation.MODIFY;
     const op2 = ResourceOperation.CREATE
@@ -97,4 +129,39 @@ describe('Change set tests', () => {
     const opResult = ChangeSet.combineResourceOperations(op1, op2);
     expect(opResult).to.eq(ResourceOperation.MODIFY);
   })
+
+  it('correctly determines array equality', () => {
+    const arrA = ['a', 'b', 'd'];
+    const arrB = ['a', 'b', 'd'];
+
+    expect(ChangeSet.isSame(arrA, arrB)).to.be.true;
+  })
+
+  it('correctly determines array equality 2', () => {
+    const arrA = ['a', 'b'];
+    const arrB = ['a', 'b', 'd'];
+
+    expect(ChangeSet.isSame(arrA, arrB)).to.be.false;
+  })
+
+  it('correctly determines array equality 3', () => {
+    const arrA = ['b', 'a', 'd'];
+    const arrB = ['a', 'b', 'd'];
+
+    expect(ChangeSet.isSame(arrA, arrB)).to.be.true;
+  })
+
+  it('correctly determines array equality 4', () => {
+    const arrA = [{ key1: 'a' }, { key1: 'a' }, { key1: 'a' }];
+    const arrB = [{ key1: 'a' }, { key1: 'a' }, { key1: 'b' }];
+
+    expect(ChangeSet.isSame(arrA, arrB)).to.be.false;
+  })
+
+  it('correctly determines array equality 5', () => {
+    const arrA = [{ key1: 'b' }, { key1: 'a' }, { key1: 'a' }];
+    const arrB = [{ key1: 'a' }, { key1: 'a' }, { key1: 'b' }];
+
+    expect(ChangeSet.isSame(arrA, arrB)).to.be.false;
+  })
 })

package/src/entities/change-set.ts

@@ -60,7 +60,7 @@ export class ChangeSet {
         continue;
       }
 
-      if (filteredPrev[k] !== filteredNext[k]) {
+      if (!ChangeSet.isSame(filteredPrev[k], filteredNext[k])) {
         parameterChangeSet.push({
           name: k,
           previousValue: v,
@@ -114,4 +114,15 @@ export class ChangeSet {
 
     return orderOfOperations[Math.max(indexPrev, indexNext)];
   }
+
+  static isSame(a: unknown, b: unknown): boolean {
+    if (Array.isArray(a) && Array.isArray(b)) {
+      const sortedPrev = a.map((x) => x).sort();
+      const sortedNext = b.map((x) => x).sort();
+
+      return JSON.stringify(sortedPrev) === JSON.stringify(sortedNext);
+    }
+
+    return a === b;
+  }
 }

package/src/entities/resource.test.ts

@@ -7,19 +7,19 @@ import { expect } from 'chai';
 import { Plan } from './plan';
 
 class TestResource extends Resource<TestConfig> {
-  applyCreate(plan: Plan): Promise<void> {
+  applyCreate(plan: Plan<TestConfig>): Promise<void> {
     return Promise.resolve(undefined);
   }
 
-  applyDestroy(plan: Plan): Promise<void> {
+  applyDestroy(plan: Plan<TestConfig>): Promise<void> {
     return Promise.resolve(undefined);
   }
 
-  applyModify(plan: Plan): Promise<void> {
+  applyModify(plan: Plan<TestConfig>): Promise<void> {
     return Promise.resolve(undefined);
   }
 
-  applyRecreate(plan: Plan): Promise<void> {
+  applyRecreate(plan: Plan<TestConfig>): Promise<void> {
     return Promise.resolve(undefined);
   }
 
@@ -156,7 +156,7 @@ describe('Resource tests', () => {
     const result = await resourceSpy.apply(
       Plan.create(
         new ChangeSet(ResourceOperation.CREATE, []),
-        { type: 'resource' }
+        { type: 'resource', propA: 'a', propB: 0 }
       )
     )
 
@@ -174,7 +174,7 @@ describe('Resource tests', () => {
     const result = await resourceSpy.apply(
       Plan.create(
         new ChangeSet(ResourceOperation.DESTROY, []),
-        { type: 'resource' }
+        { type: 'resource', propA: 'a', propB: 0 }
       )
     )
 

package/src/entities/resource.ts

@@ -17,7 +17,7 @@ export abstract class Resource<T extends ResourceConfig> {
   async plan(desiredConfig: T): Promise<Plan<T>> {
     await this.validate(desiredConfig);
 
-    const currentConfig = await this.getCurrentConfig();
+    const currentConfig = await this.getCurrentConfig(desiredConfig);
     if (!currentConfig) {
       return Plan.create(ChangeSet.createForNullCurrentConfig(desiredConfig), desiredConfig);
     }
@@ -55,9 +55,9 @@ export abstract class Resource<T extends ResourceConfig> {
     }
   }
 
-  abstract validate(config: ResourceConfig): Promise<boolean>;
+  abstract validate(config: unknown): Promise<boolean>;
 
-  abstract getCurrentConfig(): Promise<T | null>;
+  abstract getCurrentConfig(desiredConfig: T): Promise<T | null>;
 
   abstract calculateOperation(change: ParameterChange): ResourceOperation.MODIFY | ResourceOperation.RECREATE;