codify-plugin-lib 1.0.150 → 1.0.152

package/dist/plugin/plugin.js

@@ -39,6 +39,7 @@ export class Plugin {
         const resource = this.resourceControllers.get(data.type);
         const schema = resource.settings.schema;
         const requiredPropertyNames = (resource.settings.importAndDestroy?.requiredParameters
+            ?? (typeof resource.settings.allowMultiple === 'object' ? resource.settings.allowMultiple.identifyingParameters : null)
             ?? schema?.required
             ?? undefined);
         const allowMultiple = resource.settings.allowMultiple !== undefined
@@ -64,22 +65,7 @@ export class Plugin {
         if (!resource) {
             throw new Error(`Resource of type ${resourceConfig.core.type} could not be found for match`);
         }
-        if (!resource.settings.allowMultiple) {
-            return { match: array.find((r) => r.core.type === resourceConfig.core.type) };
-        }
-        const parameterMatcher = resource?.parsedSettings.matcher;
-        const match = array.find((r) => {
-            if (resourceConfig.core.type !== r.core.type) {
-                return false;
-            }
-            // If the user specifies the same name for the resource and it's not auto-generated (a number) then it's the same resource
-            if (resourceConfig.core.name === r.core.name
-                && resourceConfig.core.name
-                && Number.isInteger(Number.parseInt(resourceConfig.core.name, 10))) {
-                return true;
-            }
-            return parameterMatcher(resourceConfig.parameters, r.parameters);
-        });
+        const match = await resource.match(resourceConfig, array);
         return { match };
     }
     async import(data) {
@@ -121,10 +107,7 @@ export class Plugin {
             return !controller.parsedSettings.allowMultiple && v > 1;
         });
         if (invalidMultipleConfigs.length > 0) {
-            throw new Error(`Multiples of the following configs were found but only 1 is allowed.
-
-[${invalidMultipleConfigs.map(([k]) => k).join(', ')}]
-`);
+            throw new Error(`Multiples of the following configs were found but only 1 is allowed. [${invalidMultipleConfigs.map(([k, v]) => `${v}x ${k}`).join(', ')}] found.`);
         }
         await this.crossValidateResources(data.configs);
         return {

package/dist/resource/resource-controller.d.ts

@@ -15,6 +15,7 @@ export declare class ResourceController<T extends StringIndexedObject> {
     constructor(resource: Resource<T>);
     initialize(): Promise<void>;
     validate(core: ResourceConfig, parameters: Partial<T>): Promise<ValidateResponseData['resourceValidations'][0]>;
+    match(resource: ResourceJson, array: Array<ResourceJson>): Promise<ResourceJson | undefined>;
     plan(core: ResourceConfig, desired: Partial<T> | null, state: Partial<T> | null, isStateful?: boolean): Promise<Plan<T>>;
     planDestroy(core: ResourceConfig, parameters: Partial<T>): Promise<Plan<T>>;
     apply(plan: Plan<T>): Promise<void>;

package/dist/resource/resource-controller.js

@@ -71,6 +71,37 @@ export class ResourceController {
             schemaValidationErrors: [],
         };
     }
+    async match(resource, array) {
+        if (resource.core.type !== this.typeId) {
+            throw new Error(`Unknown type passed into match method: ${resource.core.type} for ${this.typeId}`);
+        }
+        if (!this.parsedSettings.allowMultiple) {
+            return array.find((r) => r.core.type === resource.core.type);
+        }
+        const { name, type } = resource.core;
+        const parameterMatcher = this.parsedSettings.matcher;
+        for (const resourceToMatch of array) {
+            if (type !== resourceToMatch.core.type) {
+                return undefined;
+            }
+            // If the user specifies the same name for the resource and it's not auto-generated (a number) then it's the same resource
+            if (name === resourceToMatch.core.name
+                && name
+                && Number.isInteger(Number.parseInt(name, 10))) {
+                return resourceToMatch;
+            }
+            const originalParams = structuredClone(resource.parameters);
+            const paramsToMatch = structuredClone(resourceToMatch.parameters);
+            this.addDefaultValues(originalParams);
+            await this.applyTransformParameters(originalParams);
+            this.addDefaultValues(paramsToMatch);
+            await this.applyTransformParameters(paramsToMatch);
+            const match = parameterMatcher(originalParams, paramsToMatch);
+            if (match) {
+                return resourceToMatch;
+            }
+        }
+    }
     async plan(core, desired, state, isStateful = false) {
         this.validatePlanInputs(core, desired, state, isStateful);
         this.addDefaultValues(desired);

package/dist/resource/resource-settings.d.ts

@@ -96,7 +96,7 @@ export interface ResourceSettings<T extends StringIndexedObject> {
         preventImport?: boolean;
         /**
          * Customize the required parameters needed to import this resource. By default, the `requiredParameters` are taken
-         * from the JSON schema. The `requiredParameters` parameter must be declared if a complex required is declared in
+         * from the identifyingParameters for allowMultiple. The `requiredParameters` parameter must be declared if a complex required is declared in
          * the schema (contains `oneOf`, `anyOf`, `allOf`, `if`, `then`, `else`).
          * <br>
          * The user will be prompted for the required parameters before the import starts. This is done because for most resources

package/package.json

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

package/src/plugin/plugin.ts

@@ -70,6 +70,7 @@ export class Plugin {
     const schema = resource.settings.schema as JSONSchemaType<any> | undefined;
     const requiredPropertyNames = (
       resource.settings.importAndDestroy?.requiredParameters
+      ?? (typeof resource.settings.allowMultiple === 'object' ? resource.settings.allowMultiple.identifyingParameters : null)
       ?? schema?.required
       ?? undefined
     ) as any;
@@ -101,27 +102,7 @@ export class Plugin {
       throw new Error(`Resource of type ${resourceConfig.core.type} could not be found for match`);
     }
 
-    if (!resource.settings.allowMultiple) {
-      return { match: array.find((r) => r.core.type === resourceConfig.core.type) }
-    }
-
-    const parameterMatcher = resource?.parsedSettings.matcher;
-    const match = array.find((r) => {
-      if (resourceConfig.core.type !== r.core.type) {
-        return false;
-      }
-
-      // If the user specifies the same name for the resource and it's not auto-generated (a number) then it's the same resource
-      if (resourceConfig.core.name === r.core.name
-        && resourceConfig.core.name
-        && Number.isInteger(Number.parseInt(resourceConfig.core.name, 10))
-      ) {
-        return true;
-      }
-
-      return parameterMatcher(resourceConfig.parameters, r.parameters);
-    });
-
+    const match = await resource.match(resourceConfig, array);
     return { match }
   }
 
@@ -179,10 +160,7 @@ export class Plugin {
 
     if (invalidMultipleConfigs.length > 0) {
       throw new Error(
-        `Multiples of the following configs were found but only 1 is allowed.
-
-[${invalidMultipleConfigs.map(([k]) => k).join(', ')}]
-`)
+        `Multiples of the following configs were found but only 1 is allowed. [${invalidMultipleConfigs.map(([k, v]) => `${v}x ${k}`).join(', ')}] found.`)
     }
 
     await this.crossValidateResources(data.configs);

package/src/resource/resource-controller.ts

@@ -102,6 +102,48 @@ export class ResourceController<T extends StringIndexedObject> {
     }
   }
 
+  async match(resource: ResourceJson, array: Array<ResourceJson>): Promise<ResourceJson | undefined> {
+    if (resource.core.type !== this.typeId) {
+      throw new Error(`Unknown type passed into match method: ${resource.core.type} for ${this.typeId}`);
+    }
+
+    if (!this.parsedSettings.allowMultiple) {
+      return array.find((r) => r.core.type === resource.core.type)
+    }
+
+
+    const { name, type } = resource.core;
+    const parameterMatcher = this.parsedSettings.matcher;
+
+    for (const resourceToMatch of array) {
+      if (type !== resourceToMatch.core.type) {
+        return undefined;
+      }
+
+      // If the user specifies the same name for the resource and it's not auto-generated (a number) then it's the same resource
+      if (name === resourceToMatch.core.name
+        && name
+        && Number.isInteger(Number.parseInt(name, 10))
+      ) {
+        return resourceToMatch;
+      }
+
+      const originalParams = structuredClone(resource.parameters) as Partial<T>;
+      const paramsToMatch = structuredClone(resourceToMatch.parameters) as Partial<T>;
+
+      this.addDefaultValues(originalParams);
+      await this.applyTransformParameters(originalParams);
+
+      this.addDefaultValues(paramsToMatch);
+      await this.applyTransformParameters(paramsToMatch);
+
+      const match = parameterMatcher(originalParams, paramsToMatch);
+      if (match) {
+        return resourceToMatch;
+      }
+    }
+  }
+
   async plan(
     core: ResourceConfig,
     desired: Partial<T> | null,

package/src/resource/resource-settings.ts

@@ -113,7 +113,7 @@ export interface ResourceSettings<T extends StringIndexedObject> {
 
     /**
      * Customize the required parameters needed to import this resource. By default, the `requiredParameters` are taken
-     * from the JSON schema. The `requiredParameters` parameter must be declared if a complex required is declared in
+     * from the identifyingParameters for allowMultiple. The `requiredParameters` parameter must be declared if a complex required is declared in
      * the schema (contains `oneOf`, `anyOf`, `allOf`, `if`, `then`, `else`).
      * <br>
      * The user will be prompted for the required parameters before the import starts. This is done because for most resources