codify-plugin-lib 1.0.13 → 1.0.15

package/dist/entities/plan.d.ts

@@ -1,11 +1,11 @@
 import { ChangeSet } from './change-set';
 import { PlanResponseData, ResourceConfig } from 'codify-schemas';
-export declare class Plan {
+export declare class Plan<T extends ResourceConfig> {
     id: string;
     changeSet: ChangeSet;
-    resourceConfig: ResourceConfig;
-    constructor(id: string, changeSet: ChangeSet, resourceConfig: ResourceConfig);
-    static create(changeSet: ChangeSet, resourceConfig: ResourceConfig): Plan;
+    resourceConfig: T;
+    constructor(id: string, changeSet: ChangeSet, resourceConfig: T);
+    static create<T extends ResourceConfig>(changeSet: ChangeSet, resourceConfig: T): Plan<T>;
     getResourceType(): string;
     toResponse(): PlanResponseData;
 }

package/dist/entities/plugin.d.ts

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

package/dist/entities/resource.d.ts

@@ -6,13 +6,13 @@ export declare abstract class Resource<T extends ResourceConfig> {
     constructor(dependencies?: Resource<any>[]);
     abstract getTypeId(): string;
     onInitialize(): Promise<void>;
-    plan(desiredConfig: T): Promise<Plan>;
-    apply(plan: Plan): Promise<void>;
-    abstract validate(config: ResourceConfig): Promise<boolean>;
-    abstract getCurrentConfig(): Promise<T | null>;
+    plan(desiredConfig: T): Promise<Plan<T>>;
+    apply(plan: Plan<T>): Promise<void>;
+    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): Promise<void>;
-    abstract applyModify(plan: Plan): Promise<void>;
-    abstract applyRecreate(plan: Plan): Promise<void>;
-    abstract applyDestroy(plan: Plan): Promise<void>;
+    abstract applyCreate(plan: Plan<T>): Promise<void>;
+    abstract applyModify(plan: Plan<T>): Promise<void>;
+    abstract applyRecreate(plan: Plan<T>): Promise<void>;
+    abstract applyDestroy(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.13",
+  "version": "1.0.15",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/entities/plan.ts

@@ -5,18 +5,18 @@ import {
 } from 'codify-schemas';
 import { randomUUID } from 'crypto';
 
-export class Plan {
+export class Plan<T extends ResourceConfig> {
   id: string;
   changeSet: ChangeSet;
-  resourceConfig: ResourceConfig
+  resourceConfig: T
 
-  constructor(id: string, changeSet: ChangeSet, resourceConfig: ResourceConfig) {
+  constructor(id: string, changeSet: ChangeSet, resourceConfig: T) {
     this.id = id;
     this.changeSet = changeSet;
     this.resourceConfig = resourceConfig;
   }
 
-  static create(changeSet: ChangeSet, resourceConfig: ResourceConfig) {
+  static create<T extends ResourceConfig>(changeSet: ChangeSet, resourceConfig: T): Plan<T> {
     return new Plan(
       randomUUID(),
       changeSet,

package/src/entities/plugin.ts

@@ -10,7 +10,7 @@ import {
 import { Plan } from './plan';
 
 export class Plugin {
-  planStorage: Map<string, Plan>;
+  planStorage: Map<string, Plan<ResourceConfig>>;
 
   constructor(
     public resources: Map<string, Resource<ResourceConfig>>

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

@@ -14,10 +14,10 @@ export abstract class Resource<T extends ResourceConfig> {
 
   // TODO: Add state in later.
   //  Calculate change set from current config -> state -> desired in the future
-  async plan(desiredConfig: T): Promise<Plan> {
+  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);
     }
@@ -42,7 +42,7 @@ export abstract class Resource<T extends ResourceConfig> {
     );
   }
 
-  async apply(plan: Plan): Promise<void> {
+  async apply(plan: Plan<T>): Promise<void> {
     if (plan.getResourceType() !== this.getTypeId()) {
       throw new Error(`Internal error: Plan set to wrong resource during apply. Expected ${this.getTypeId()} but got: ${plan.getResourceType()}`);
     }
@@ -55,17 +55,17 @@ 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;
 
-  abstract applyCreate(plan: Plan): Promise<void>;
+  abstract applyCreate(plan: Plan<T>): Promise<void>;
 
-  abstract applyModify(plan: Plan): Promise<void>;
+  abstract applyModify(plan: Plan<T>): Promise<void>;
 
-  abstract applyRecreate(plan: Plan): Promise<void>;
+  abstract applyRecreate(plan: Plan<T>): Promise<void>;
 
-  abstract applyDestroy(plan:Plan): Promise<void>;
+  abstract applyDestroy(plan:Plan<T>): Promise<void>;
 }