codify-plugin-lib 1.0.10 → 1.0.12

package/dist/entities/plugin.d.ts

@@ -1,8 +1,9 @@
 import { Resource } from './resource';
 import { ApplyRequestData, PlanRequestData, PlanResponseData, ResourceConfig, ValidateRequestData, ValidateResponseData } from 'codify-schemas';
+import { Plan } from './plan';
 export declare class Plugin {
     resources: Map<string, Resource<ResourceConfig>>;
-    planStorage: Map<string, any>;
+    planStorage: Map<string, Plan>;
     constructor(resources: Map<string, Resource<ResourceConfig>>);
     onInitialize(): Promise<void>;
     validate(data: ValidateRequestData): Promise<ValidateResponseData>;

package/dist/entities/plugin.js

@@ -29,6 +29,16 @@ class Plugin {
         return plan.toResponse();
     }
     async apply(data) {
+        const { planId } = data;
+        const plan = this.planStorage.get(planId);
+        if (!plan) {
+            throw new Error(`Plan with id: ${planId} was not found`);
+        }
+        const resource = this.resources.get(plan.getResourceType());
+        if (!resource) {
+            throw new Error('Malformed plan with resource that cannot be found');
+        }
+        await resource.apply(plan);
     }
     async crossValidateResources(configs) { }
 }

package/dist/entities/resource.d.ts

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

package/dist/entities/resource.js

@@ -26,25 +26,16 @@ class Resource {
         return plan_1.Plan.create(new change_set_1.ChangeSet(resourceOperation, parameterChangeSet), desiredConfig);
     }
     async apply(plan) {
-        if (plan.getResourceType()) {
-            throw new Error('Internal error: Plan set to wrong resource during apply');
+        if (plan.getResourceType() !== this.getTypeId()) {
+            throw new Error(`Internal error: Plan set to wrong resource during apply. Expected ${this.getTypeId()} but got: ${plan.getResourceType()}`);
         }
         const changeSet = plan.changeSet;
         switch (plan.changeSet.operation) {
-            case codify_schemas_1.ResourceOperation.CREATE:
-                await this.applyCreate(changeSet);
-                break;
-            case codify_schemas_1.ResourceOperation.MODIFY:
-                await this.applyModify(changeSet);
-                break;
-            case codify_schemas_1.ResourceOperation.RECREATE:
-                await this.applyRecreate(changeSet);
-                break;
-            case codify_schemas_1.ResourceOperation.DESTROY:
-                await this.applyDestroy(changeSet);
-                break;
+            case codify_schemas_1.ResourceOperation.CREATE: return this.applyCreate(changeSet);
+            case codify_schemas_1.ResourceOperation.MODIFY: return this.applyModify(changeSet);
+            case codify_schemas_1.ResourceOperation.RECREATE: return this.applyRecreate(changeSet);
+            case codify_schemas_1.ResourceOperation.DESTROY: return this.applyDestroy(changeSet);
         }
-        return null;
     }
 }
 exports.Resource = Resource;

package/dist/messages/handlers.js

@@ -21,7 +21,10 @@ const SupportedRequests = {
     'apply': {
         requestValidator: codify_schemas_1.ApplyRequestDataSchema,
         responseValidator: codify_schemas_1.ApplyResponseDataSchema,
-        handler: async (plugin, data) => plugin.apply(data)
+        handler: async (plugin, data) => {
+            await plugin.apply(data);
+            return null;
+        }
     }
 };
 class MessageHandler {

package/dist/utils/utils.d.ts

@@ -12,6 +12,6 @@ type CodifySpawnOptions = {
     cwd?: string;
     stdioString?: boolean;
 } & SpawnOptions;
-export declare function codifySpawn(cmd: string, args: string[], opts?: CodifySpawnOptions, extras?: Record<any, any>): Promise<SpawnResult>;
+export declare function codifySpawn(cmd: string, args?: string[], opts?: Omit<CodifySpawnOptions, 'stdio' | 'stdioString' | 'shell'>, extras?: Record<any, any>): Promise<SpawnResult>;
 export declare function isDebug(): boolean;
 export {};

package/dist/utils/utils.js

@@ -13,7 +13,7 @@ var SpawnStatus;
 async function codifySpawn(cmd, args, opts, extras) {
     try {
         const stdio = isDebug() ? 'inherit' : 'pipe';
-        const result = await (0, promise_spawn_1.default)(cmd, args, { ...opts, stdio, stdioString: true, shell: true }, extras);
+        const result = await (0, promise_spawn_1.default)(cmd, args ?? [], { ...opts, stdio, stdioString: true, shell: true }, extras);
         const status = (result.code === 0 && !result.stderr)
             ? SpawnStatus.SUCCESS
             : SpawnStatus.ERROR;

package/package.json

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

package/src/utils/utils.ts

@@ -18,15 +18,15 @@ type CodifySpawnOptions = {
 
 export async function codifySpawn(
   cmd: string,
-  args: string[],
-  opts?: CodifySpawnOptions,
+  args?: string[],
+  opts?: Omit<CodifySpawnOptions, 'stdio' | 'stdioString' | 'shell'>,
   extras?: Record<any, any>,
 ): Promise<SpawnResult> {
   try {
     const stdio = isDebug() ? 'inherit' : 'pipe';
     const result = await promiseSpawn(
       cmd,
-      args,
+      args ?? [],
       { ...opts, stdio, stdioString: true, shell: true },
       extras
     );