codify-plugin-lib 1.0.51 → 1.0.52

package/dist/entities/resource.js

@@ -55,9 +55,9 @@ export class Resource {
             parameterOptions: this.parameterOptions,
         };
         const parsedConfig = new ConfigParser(desiredConfig, this.statefulParameters, this.transformParameters);
-        const { parameters: desiredParameters, resourceMetadata, resourceParameters, statefulParameters } = parsedConfig;
+        const { parameters: desiredParameters, resourceMetadata, resourceParameters, statefulParameters, transformParameters, } = parsedConfig;
         this.addDefaultValues(resourceParameters);
-        await this.applyTransformParameters(resourceParameters);
+        await this.applyTransformParameters(transformParameters, resourceParameters);
         const currentParameters = await this.refreshResourceParameters(resourceParameters);
         if (currentParameters == null) {
             return Plan.create(desiredParameters, null, resourceMetadata, planOptions);
@@ -151,8 +151,8 @@ Missing: ${[...desiredKeys].filter((k) => !refreshKeys.has(k))};
 Additional: ${[...refreshKeys].filter(k => !desiredKeys.has(k))};`);
         }
     }
-    async applyTransformParameters(desired) {
-        const orderedEntries = [...this.transformParameters.entries()]
+    async applyTransformParameters(transformParameters, desired) {
+        const orderedEntries = [...Object.entries(transformParameters)]
             .sort(([keyA], [keyB]) => this.transformParameterOrder.get(keyA) - this.transformParameterOrder.get(keyB));
         for (const [key, tp] of orderedEntries) {
             if (desired[key] !== null) {

package/package.json

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

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

@@ -407,6 +407,43 @@ describe('Resource parameters tests', () => {
     expect(plan.changeSet.operation).to.eq(ResourceOperation.NOOP);
   })
 
+  it('Does not call transform parameters unless they are specified in the user config', async () => {
+    const transformParameter = spy(new class extends TransformParameter<TestConfig> {
+      async transform(value: any): Promise<Partial<TestConfig>> {
+        return {
+          propA: 'propA',
+          propB: 10,
+        }
+      }
+    })
+
+    const resource = spy(new class extends TestResource {
+      constructor() {
+        super({
+          type: 'resourceType',
+          parameterOptions: {
+            propC: { transformParameter }
+          },
+        });
+      }
+
+      async refresh(): Promise<Partial<TestConfig> | null> {
+        return {
+          propA: 'propA',
+          propB: 10,
+        }
+      }
+    });
+
+    const plan = await resource.plan({ type: 'resourceType', propA: 'propA', propB: 10 } as any);
+
+    expect(transformParameter.transform.called).to.be.false;
+    expect(resource.refresh.getCall(0).firstArg.has('propA')).to.be.true;
+    expect(resource.refresh.getCall(0).firstArg.has('propB')).to.be.true;
+
+    expect(plan.changeSet.operation).to.eq(ResourceOperation.NOOP);
+  })
+
   it('Plans transform parameters in the order specified', async () => {
     const transformParameterA = spy(new class extends TransformParameter<TestConfig> {
       async transform(value: any): Promise<Partial<TestConfig>> {

package/src/entities/resource.ts

@@ -89,11 +89,12 @@ export abstract class Resource<T extends StringIndexedObject> {
       parameters: desiredParameters,
       resourceMetadata,
       resourceParameters,
-      statefulParameters
+      statefulParameters,
+      transformParameters,
     } = parsedConfig;
 
     this.addDefaultValues(resourceParameters);
-    await this.applyTransformParameters(resourceParameters);
+    await this.applyTransformParameters(transformParameters, resourceParameters);
 
     // Refresh resource parameters. This refreshes the parameters that configure the resource itself
     const currentParameters = await this.refreshResourceParameters(resourceParameters);
@@ -223,8 +224,8 @@ Additional: ${[...refreshKeys].filter(k => !desiredKeys.has(k))};`
     }
   }
 
-  private async applyTransformParameters(desired: Partial<T>): Promise<void> {
-    const orderedEntries = [...this.transformParameters.entries()]
+  private async applyTransformParameters(transformParameters: Partial<T>, desired: Partial<T>): Promise<void> {
+    const orderedEntries = [...Object.entries(transformParameters)]
       .sort(([keyA], [keyB]) => this.transformParameterOrder.get(keyA)! - this.transformParameterOrder.get(keyB)!)
 
     for (const [key, tp] of orderedEntries) {