codify-plugin-lib 1.0.117 → 1.0.119

package/dist/plugin/plugin.js

@@ -55,9 +55,9 @@ export class Plugin {
         if (!this.resourceControllers.has(data.config.type)) {
             throw new Error(`Cannot get info for resource ${data.config.type}, resource doesn't exist`);
         }
-        const result = await this.resourceControllers
+        const result = await ptyLocalStorage.run(this.planPty, () => this.resourceControllers
             .get(data.config.type)
-            ?.import(data.config);
+            ?.import(data.config));
         return {
             request: data.config,
             result: result ?? [],
@@ -98,8 +98,9 @@ export class Plugin {
             throw new Error('Malformed plan with resource that cannot be found');
         }
         await resource.apply(plan);
+        // Validate using desired/desired. If the apply was successful, no changes should be reported back
         const validationPlan = await ptyLocalStorage.run(new BackgroundPty(), async () => {
-            const result = await resource.plan(plan.desiredConfig, plan.currentConfig, plan.statefulMode);
+            const result = await resource.plan(plan.desiredConfig, plan.desiredConfig, plan.statefulMode);
             await getPty().kill();
             return result;
         });

package/package.json

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

package/src/plugin/plugin.ts

@@ -87,9 +87,11 @@ export class Plugin {
       throw new Error(`Cannot get info for resource ${data.config.type}, resource doesn't exist`);
     }
 
-    const result = await this.resourceControllers
-      .get(data.config.type!)
-      ?.import(data.config);
+    const result = await ptyLocalStorage.run(this.planPty, () =>
+      this.resourceControllers
+        .get(data.config.type!)
+        ?.import(data.config)
+    )
 
     return {
       request: data.config,
@@ -149,10 +151,11 @@ export class Plugin {
 
     await resource.apply(plan);
 
+    // Validate using desired/desired. If the apply was successful, no changes should be reported back
     const validationPlan = await ptyLocalStorage.run(new BackgroundPty(), async () => {
       const result = await resource.plan(
         plan.desiredConfig,
-        plan.currentConfig,
+        plan.desiredConfig,
         plan.statefulMode
       );