codify-plugin-lib 1.0.158 → 1.0.160

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

@@ -32,4 +32,5 @@ export declare class ResourceController<T extends StringIndexedObject> {
     private validatePlanInputs;
     private getSortedStatefulParameterChanges;
     private getAllParameterKeys;
+    private getParametersToRefreshForImport;
 }

package/dist/resource/resource-controller.js

@@ -193,22 +193,7 @@ export class ResourceController {
         this.addDefaultValues(parameters);
         await this.applyTransformParameters(parameters);
         // Use refresh parameters if specified, otherwise try to refresh as many parameters as possible here
-        const parametersToRefresh = this.settings.importAndDestroy?.refreshKeys
-            ? {
-                ...Object.fromEntries(this.settings.importAndDestroy?.refreshKeys.map((k) => [k, null])),
-                ...this.settings.importAndDestroy?.defaultRefreshValues,
-                ...parameters,
-                ...(Object.fromEntries(// If a default value was used, but it was also declared in the defaultRefreshValues, prefer the defaultRefreshValue instead
-                Object.entries(parameters).filter(([k, v]) => this.parsedSettings.defaultValues[k] !== undefined
-                    && v === this.parsedSettings.defaultValues[k]
-                    && context.originalDesiredConfig?.[k] === undefined
-                    && this.settings.importAndDestroy?.defaultRefreshValues?.[k] !== undefined).map(([k]) => [k, this.settings.importAndDestroy.defaultRefreshValues[k]])))
-            }
-            : {
-                ...Object.fromEntries(this.getAllParameterKeys().map((k) => [k, null])),
-                ...this.settings.importAndDestroy?.defaultRefreshValues,
-                ...parameters,
-            };
+        const parametersToRefresh = this.getParametersToRefreshForImport(parameters, context);
         // Parse data from the user supplied config
         const parsedConfig = new ConfigParser(parametersToRefresh, null, this.parsedSettings.statefulParameters);
         const { allParameters, allNonStatefulParameters, allStatefulParameters, } = parsedConfig;
@@ -373,4 +358,25 @@ ${JSON.stringify(refresh, null, 2)}
             ? Object.keys(this.settings.schema?.properties)
             : Object.keys(this.parsedSettings.parameterSettings);
     }
+    getParametersToRefreshForImport(parameters, context) {
+        if (this.settings.importAndDestroy?.refreshMapper) {
+            return this.settings.importAndDestroy?.refreshMapper(parameters, context);
+        }
+        return this.settings.importAndDestroy?.refreshKeys
+            ? {
+                ...Object.fromEntries(this.settings.importAndDestroy?.refreshKeys.map((k) => [k, null])),
+                ...this.settings.importAndDestroy?.defaultRefreshValues,
+                ...parameters,
+                ...(Object.fromEntries(// If a default value was used, but it was also declared in the defaultRefreshValues, prefer the defaultRefreshValue instead
+                Object.entries(parameters).filter(([k, v]) => this.parsedSettings.defaultValues[k] !== undefined
+                    && v === this.parsedSettings.defaultValues[k]
+                    && context.originalDesiredConfig?.[k] === undefined
+                    && this.settings.importAndDestroy?.defaultRefreshValues?.[k] !== undefined).map(([k]) => [k, this.settings.importAndDestroy.defaultRefreshValues[k]])))
+            }
+            : {
+                ...Object.fromEntries(this.getAllParameterKeys().map((k) => [k, null])),
+                ...this.settings.importAndDestroy?.defaultRefreshValues,
+                ...parameters,
+            };
+    }
 }

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

@@ -1,6 +1,7 @@
 import { JSONSchemaType } from 'ajv';
 import { StringIndexedObject } from 'codify-schemas';
 import { ArrayStatefulParameter, StatefulParameter } from '../stateful-parameter/stateful-parameter.js';
+import { RefreshContext } from './resource.js';
 export interface InputTransformation {
     to: (input: any) => Promise<any> | any;
     from: (current: any, original: any) => Promise<any> | any;
@@ -122,6 +123,14 @@ export interface ResourceSettings<T extends StringIndexedObject> {
          * See {@link importAndDestroy} for more information on how importing works.
          */
         defaultRefreshValues?: Partial<T>;
+        /**
+         * A custom function that maps the input to what gets passed to refresh for imports. If this is set, then refreshKeys and
+         * defaultRefreshValues are ignored.
+         *
+         * @param input
+         * @param context
+         */
+        refreshMapper?: (input: Partial<T>, context: RefreshContext<T>) => Partial<T>;
     };
 }
 /**

package/dist/resource/resource-settings.js

@@ -58,7 +58,7 @@ const ParameterTransformationDefaults = {
             if (ParameterEqualsDefaults.directory(a, original)) {
                 return original;
             }
-            return addVariablesToPath(tildify(String(a)));
+            return tildify(addVariablesToPath(String(a)));
         },
     },
     'string': {

package/dist/utils/utils.js

@@ -33,7 +33,7 @@ export function resolvePathWithVariables(pathWithVariables) {
 export function addVariablesToPath(pathWithoutVariables) {
     let result = pathWithoutVariables;
     for (const [key, value] of Object.entries(process.env)) {
-        if (!value || !path.isAbsolute(value) || value === '/') {
+        if (!value || !path.isAbsolute(value) || value === '/' || key === 'HOME' || key === 'PATH' || key === 'SHELL' || key === 'PWD') {
             continue;
         }
         result = result.replaceAll(value, `$${key}`);

package/package.json

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

package/src/resource/resource-controller.ts

@@ -274,29 +274,7 @@ export class ResourceController<T extends StringIndexedObject> {
     await this.applyTransformParameters(parameters);
 
     // Use refresh parameters if specified, otherwise try to refresh as many parameters as possible here
-    const parametersToRefresh = this.settings.importAndDestroy?.refreshKeys
-      ? {
-        ...Object.fromEntries(
-          this.settings.importAndDestroy?.refreshKeys.map((k) => [k, null])
-        ),
-        ...this.settings.importAndDestroy?.defaultRefreshValues,
-        ...parameters,
-        ...(Object.fromEntries( // If a default value was used, but it was also declared in the defaultRefreshValues, prefer the defaultRefreshValue instead
-          Object.entries(parameters).filter(([k, v]) =>
-            this.parsedSettings.defaultValues[k] !== undefined
-            && v === this.parsedSettings.defaultValues[k]
-            && context.originalDesiredConfig?.[k] === undefined
-            && this.settings.importAndDestroy?.defaultRefreshValues?.[k] !== undefined
-          ).map(([k]) => [k, this.settings.importAndDestroy!.defaultRefreshValues![k]])
-        ))
-      }
-      : {
-        ...Object.fromEntries(
-          this.getAllParameterKeys().map((k) => [k, null])
-        ),
-        ...this.settings.importAndDestroy?.defaultRefreshValues,
-        ...parameters,
-      };
+    const parametersToRefresh = this.getParametersToRefreshForImport(parameters, context);
 
     // Parse data from the user supplied config
     const parsedConfig = new ConfigParser(parametersToRefresh, null, this.parsedSettings.statefulParameters)
@@ -325,6 +303,8 @@ export class ResourceController<T extends StringIndexedObject> {
     }
 
     return resultParametersArray?.map((r) => ({ core, parameters: r }))
+
+
   }
 
   private async applyCreate(plan: Plan<T>): Promise<void> {
@@ -523,5 +503,35 @@ ${JSON.stringify(refresh, null, 2)}
       ? Object.keys((this.settings.schema as any)?.properties)
       : Object.keys(this.parsedSettings.parameterSettings);
   }
+
+  private getParametersToRefreshForImport(parameters: Partial<T>, context: RefreshContext<T>): Partial<T> {
+    if (this.settings.importAndDestroy?.refreshMapper) {
+      return this.settings.importAndDestroy?.refreshMapper(parameters, context);
+    }
+
+    return this.settings.importAndDestroy?.refreshKeys
+      ? {
+        ...Object.fromEntries(
+          this.settings.importAndDestroy?.refreshKeys.map((k) => [k, null])
+        ),
+        ...this.settings.importAndDestroy?.defaultRefreshValues,
+        ...parameters,
+        ...(Object.fromEntries( // If a default value was used, but it was also declared in the defaultRefreshValues, prefer the defaultRefreshValue instead
+          Object.entries(parameters).filter(([k, v]) =>
+            this.parsedSettings.defaultValues[k] !== undefined
+            && v === this.parsedSettings.defaultValues[k]
+            && context.originalDesiredConfig?.[k] === undefined
+            && this.settings.importAndDestroy?.defaultRefreshValues?.[k] !== undefined
+          ).map(([k]) => [k, this.settings.importAndDestroy!.defaultRefreshValues![k]])
+        ))
+      }
+      : {
+        ...Object.fromEntries(
+          this.getAllParameterKeys().map((k) => [k, null])
+        ),
+        ...this.settings.importAndDestroy?.defaultRefreshValues,
+        ...parameters,
+      };
+  }
 }
 

package/src/resource/resource-settings.ts

@@ -6,6 +6,7 @@ import path from 'node:path';
 import { ArrayStatefulParameter, StatefulParameter } from '../stateful-parameter/stateful-parameter.js';
 import { addVariablesToPath, areArraysEqual, resolvePathWithVariables, tildify, untildify } from '../utils/utils.js';
 import { or } from 'ajv/dist/compile/codegen/index.js';
+import { RefreshContext } from './resource.js';
 
 export interface InputTransformation {
   to: (input: any) => Promise<any> | any;
@@ -142,6 +143,15 @@ export interface ResourceSettings<T extends StringIndexedObject> {
      * See {@link importAndDestroy} for more information on how importing works.
      */
     defaultRefreshValues?: Partial<T>;
+
+    /**
+     * A custom function that maps the input to what gets passed to refresh for imports. If this is set, then refreshKeys and
+     * defaultRefreshValues are ignored.
+     *
+     * @param input
+     * @param context
+     */
+    refreshMapper?: (input: Partial<T>, context: RefreshContext<T>) => Partial<T>
   }
 }
 
@@ -375,7 +385,7 @@ const ParameterTransformationDefaults: Partial<Record<ParameterSettingType, Inpu
         return original;
       }
 
-      return addVariablesToPath(tildify(String(a)))
+      return tildify(addVariablesToPath(String(a)))
     },
   },
   'string': {

package/src/utils/utils.ts

@@ -46,7 +46,7 @@ export function resolvePathWithVariables(pathWithVariables: string) {
 export function addVariablesToPath(pathWithoutVariables: string) {
   let result = pathWithoutVariables;
   for (const [key, value] of Object.entries(process.env)) {
-    if (!value || !path.isAbsolute(value) || value === '/') {
+    if (!value || !path.isAbsolute(value) || value === '/' || key === 'HOME' || key === 'PATH' || key === 'SHELL' || key === 'PWD') {
       continue;
     }