codify-plugin-lib 1.0.19 → 1.0.20

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

@@ -2,8 +2,8 @@ import { ParameterOperation, ResourceConfig, ResourceOperation } from 'codify-sc
 export interface ParameterChange {
     name: string;
     operation: ParameterOperation;
-    previousValue: string | null;
-    newValue: string | null;
+    previousValue: unknown | null;
+    newValue: unknown | null;
 }
 export declare class ChangeSet {
     operation: ResourceOperation;

package/dist/entities/resource.d.ts

@@ -12,7 +12,7 @@ export declare abstract class Resource<T extends ResourceConfig> {
     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>;
+    abstract applyModifyParameter(parameterChange: ParameterChange, plan: Plan<T>): Promise<void>;
     abstract applyRecreate(plan: Plan<T>): Promise<void>;
     abstract applyDestroy(plan: Plan<T>): Promise<void>;
 }

package/dist/entities/resource.js

@@ -30,8 +30,15 @@ class Resource {
             throw new Error(`Internal error: Plan set to wrong resource during apply. Expected ${this.getTypeId()} but got: ${plan.getResourceType()}`);
         }
         switch (plan.changeSet.operation) {
+            case codify_schemas_1.ResourceOperation.MODIFY: {
+                const parameterChanges = plan.changeSet.parameterChanges
+                    .filter((c) => c.operation !== codify_schemas_1.ParameterOperation.NOOP);
+                for (const parameterChange of parameterChanges) {
+                    await this.applyModifyParameter(parameterChange, plan);
+                }
+                return;
+            }
             case codify_schemas_1.ResourceOperation.CREATE: return this.applyCreate(plan);
-            case codify_schemas_1.ResourceOperation.MODIFY: return this.applyModify(plan);
             case codify_schemas_1.ResourceOperation.RECREATE: return this.applyRecreate(plan);
             case codify_schemas_1.ResourceOperation.DESTROY: return this.applyDestroy(plan);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "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.7",
+    "codify-schemas": "1.0.8",
     "@npmcli/promise-spawn": "^7.0.1"
   },
   "devDependencies": {

package/src/entities/change-set.ts

@@ -3,8 +3,8 @@ import { ParameterOperation, ResourceConfig, ResourceOperation } from 'codify-sc
 export interface ParameterChange {
   name: string;
   operation: ParameterOperation;
-  previousValue: string | null;
-  newValue: string | null;
+  previousValue: unknown | null;
+  newValue: unknown | null;
 }
 
 export class ChangeSet {

package/src/entities/resource.test.ts

@@ -1,6 +1,6 @@
 import { describe } from 'mocha';
 import { Resource } from './resource';
-import { ResourceConfig, ResourceOperation } from 'codify-schemas';
+import { ParameterOperation, ResourceConfig, ResourceOperation } from 'codify-schemas';
 import { ChangeSet, ParameterChange } from './change-set';
 import { spy } from 'sinon';
 import { expect } from 'chai';
@@ -15,7 +15,7 @@ class TestResource extends Resource<TestConfig> {
     return Promise.resolve(undefined);
   }
 
-  applyModify(plan: Plan<TestConfig>): Promise<void> {
+  applyModifyParameter(parameterChange: ParameterChange, plan: Plan<TestConfig>): Promise<void> {
     return Promise.resolve(undefined);
   }
 
@@ -180,4 +180,35 @@ describe('Resource tests', () => {
 
     expect(resourceSpy.applyDestroy.calledOnce).to.be.true;
   })
+
+  it('calls modify the correct number of times', async () => {
+    const resource = new class extends TestResource {
+      getTypeId(): string {
+        return 'resource'
+      }
+    }
+
+    const resourceSpy = spy(resource);
+    const result = await resourceSpy.apply(
+      Plan.create(
+        new ChangeSet(ResourceOperation.MODIFY, [
+          {
+            name: 'propA',
+            newValue: 'a',
+            previousValue: 'b',
+            operation: ParameterOperation.ADD,
+          },
+          {
+            name: 'propB',
+            newValue: 0,
+            previousValue: -1,
+            operation: ParameterOperation.ADD,
+          },
+        ]),
+        { type: 'resource', propA: 'a', propB: 0 }
+      )
+    );
+
+    expect(resourceSpy.applyModifyParameter.calledTwice).to.be.true;
+  })
 })

package/src/entities/resource.ts

@@ -48,8 +48,17 @@ export abstract class Resource<T extends ResourceConfig> {
     }
 
     switch (plan.changeSet.operation) {
+      case ResourceOperation.MODIFY: {
+        const parameterChanges = plan.changeSet.parameterChanges
+          .filter((c) => c.operation !== ParameterOperation.NOOP);
+
+        for (const parameterChange of parameterChanges) {
+          await this.applyModifyParameter(parameterChange, plan);
+        }
+
+        return;
+      }
       case ResourceOperation.CREATE: return this.applyCreate(plan);
-      case ResourceOperation.MODIFY: return this.applyModify(plan);
       case ResourceOperation.RECREATE: return this.applyRecreate(plan);
       case ResourceOperation.DESTROY: return this.applyDestroy(plan);
     }
@@ -63,7 +72,7 @@ export abstract class Resource<T extends ResourceConfig> {
 
   abstract applyCreate(plan: Plan<T>): Promise<void>;
 
-  abstract applyModify(plan: Plan<T>): Promise<void>;
+  abstract applyModifyParameter(parameterChange: ParameterChange, plan: Plan<T>): Promise<void>;
 
   abstract applyRecreate(plan: Plan<T>): Promise<void>;