feat: Bumped library version. New transformations type

Author: kevinwang5658

package.json

@@ -23,7 +23,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "semver": "^7.6.0",
-    "codify-plugin-lib": "1.0.132",
+    "codify-plugin-lib": "1.0.136",
     "codify-schemas": "1.0.63",
     "chalk": "^5.3.0",
     "debug": "^4.3.4",

src/resources/asdf/asdf-global.ts

@@ -18,7 +18,7 @@ export class AsdfGlobalResource extends Resource<AsdfGlobalConfig> {
       id: 'asdf-global',
       dependencies: ['asdf', 'asdf-plugin'],
       schema: AsdfGlobalSchema,
-      import: {
+      importAndDestroy:{
         requiredParameters: ['plugin'],
         refreshKeys: ['plugin', 'version'],
         defaultRefreshValues: {

src/resources/asdf/asdf-install.ts

@@ -25,10 +25,10 @@ export class AsdfInstallResource extends Resource<AsdfInstallConfig> {
       dependencies: ['asdf'],
       schema: AsdfInstallSchema,
       parameterSettings: {
-        directory: { type: 'directory', inputTransformation: (input) => untildify(input) },
+        directory: { type: 'directory' },
         versions: { type: 'array' }
       },
-      import: {
+      importAndDestroy:{
         requiredParameters: ['directory'],
         refreshKeys: ['directory']
       },

src/resources/asdf/asdf-local.ts

@@ -33,19 +33,13 @@ export class AsdfLocalResource extends Resource<AsdfLocalConfig> {
       dependencies: ['asdf', 'asdf-plugin'],
       schema: AsdfLocalSchema,
       parameterSettings: {
-        directory: {
-          inputTransformation: (input) => untildify(input),
-        },
-        directories: {
-          type: 'array',
-          canModify: true,
-          inputTransformation: (input) => input.map((i: any) => untildify(i)),
-        },
+        directory: { type: 'directory' },
+        directories: { type: 'array', canModify: true, itemType: 'directory' },
         version: {
           canModify: true,
         }
       },
-      import: {
+      importAndDestroy:{
         requiredParameters: ['plugin', 'directory'],
         refreshKeys: ['plugin', 'version', 'directory'],
         defaultRefreshValues: {

src/resources/aws-cli/profile/aws-profile.ts

@@ -14,7 +14,7 @@ import path from 'node:path';
 
 import { SpawnStatus, codifySpawn } from '../../../utils/codify-spawn.js';
 import Schema from './aws-profile-schema.json'
-import { CSVCredentialsParameter } from './csv-credentials-parameter.js';
+import { CSVCredentialsTransformation } from './csv-credentials-transformation.js';
 
 export interface AwsProfileConfig extends StringIndexedObject {
   awsAccessKeyId: string;
@@ -37,24 +37,25 @@ export class AwsProfileResource extends Resource<AwsProfileConfig> {
       parameterSettings: {
         awsAccessKeyId: { canModify: true },
         awsSecretAccessKey: { canModify: true },
+        csvCredentials: { type: 'setting' }, // Type setting means it won't be included in the plan calculation
         output: { default: 'json', canModify: true },
         profile: { default: 'default', canModify: true },
         metadataServiceNumAttempts: { canModify: true },
         metadataServiceTimeout: { canModify: true },
       },
-      inputTransformation: CSVCredentialsParameter.transform,
-      import: {
+      transformation: CSVCredentialsTransformation,
+      importAndDestroy:{
         refreshKeys: ['output', 'profile', 'awsAccessKeyId', 'awsSecretAccessKey', 'region'],
         requiredParameters: ['profile']
       }
     };
   }
 
   override async validate(parameters: Partial<AwsProfileConfig>): Promise<void> {
-    if (parameters.csvCredentials
-      && (parameters.awsAccessKeyId || parameters.awsSecretAccessKey)) {
-      throw new Error('Csv credentials cannot be added together with awsAccessKeyId or awsSecretAccessKey')
-    }
+    // if (parameters.csvCredentials
+    //   && (parameters.awsAccessKeyId || parameters.awsSecretAccessKey)) {
+    //   throw new Error('Csv credentials cannot be added together with awsAccessKeyId or awsSecretAccessKey')
+    // }
   }
 
   override async refresh(parameters: Partial<AwsProfileConfig>): Promise<Partial<AwsProfileConfig> | null> {

…cli/profile/csv-credentials-parameter.ts …rofile/csv-credentials-transformation.tssrc/resources/aws-cli/profile/csv-credentials-parameter.ts renamed to src/resources/aws-cli/profile/csv-credentials-transformation.ts src/resources/aws-cli/profile/csv-credentials-parameter.ts renamed to src/resources/aws-cli/profile/csv-credentials-transformation.ts

@@ -1,13 +1,13 @@
+import { type InputTransformation } from 'codify-plugin-lib';
 import * as fsSync from 'node:fs';
 import * as fs from 'node:fs/promises';
 import path from 'node:path';
 
 import { untildify } from '../../../utils/untildify.js';
 import { AwsProfileConfig } from './aws-profile.js';
 
-export const CSVCredentialsParameter = {
-
-  async transform(input: Partial<AwsProfileConfig>): Promise<Partial<AwsProfileConfig>> {
+export const CSVCredentialsTransformation: InputTransformation = {
+  async to(input: Partial<AwsProfileConfig>): Promise<Partial<AwsProfileConfig>> {
     if (!input.csvCredentials) {
       return input;
     }
@@ -30,13 +30,17 @@ export const CSVCredentialsParameter = {
       throw new Error(`File ${csvPath} is not properly formatted. It must be a csv in the format: awsAccessKeyId, awsSecretAccessKey`);
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { csvCredentials: _, awsAccessKeyId: __, awsSecretAccessKey: ___, ...restOfParameters } = input;
-
     return {
-      ...restOfParameters,
+      ...input,
       awsAccessKeyId,
       awsSecretAccessKey,
     };
   },
+  
+  from(output: Partial<AwsProfileConfig>): Partial<AwsProfileConfig> {
+    delete output.awsAccessKeyId
+    delete output.awsSecretAccessKey
+    
+    return output;
+  }
 };

src/resources/git/clone/git-clone.ts

@@ -25,7 +25,7 @@ export class GitCloneResource extends Resource<GitCloneConfig> {
         directory: { type: 'directory' },
         autoVerifySSH: { type: 'setting', default: true },
       },
-      import: {
+      importAndDestroy:{
         requiredParameters: ['directory']
       },
       dependencies: [
@@ -99,6 +99,7 @@ export class GitCloneResource extends Resource<GitCloneConfig> {
 
   override async destroy(plan: DestroyPlan<GitCloneConfig>): Promise<void> {
     // Do nothing here. We don't want to destroy a user's repository.
+    // TODO: change this to skip the destroy only if the user's repo has pending changes (check via git)
     throw new Error(`The git-clone resource is not designed to delete folders. 
 Please delete ${plan.currentConfig.directory ?? (plan.currentConfig.parentDirectory! + this.extractBasename(plan.currentConfig.repository))} manually and re-apply`);
   }

src/resources/scripting/file.ts

@@ -22,7 +22,7 @@ export class FileResource extends Resource<FileConfig> {
         contents: { canModify: true },
         onlyCreate: { type: 'boolean' }
       },
-      import: {
+      importAndDestroy:{
         requiredParameters: ['path']
       }
     }

src/resources/shell/path/path-resource.ts

@@ -30,27 +30,11 @@ export class PathResource extends Resource<PathConfig> {
       id: 'path',
       schema: Schema,
       parameterSettings: {
-        path: {
-          type: 'directory',
-          inputTransformation: (value) => {
-            const escapedPath = untildify(value);
-            return path.resolve(escapedPath)
-          }
-        },
-        paths: {
-          canModify: true,
-          type: 'array',
-          isElementEqual: 'directory',
-          inputTransformation: (values) =>
-            values.map((value: string) => {
-              const escapedPath = untildify(value);
-              return path.resolve(escapedPath)
-            }
-          )
-        },
+        path: { type: 'directory' },
+        paths: { canModify: true, type: 'array', itemType: 'directory' },
         prepend: { default: false }
       },
-      import: {
+      importAndDestroy:{
         refreshKeys: ['paths'],
         defaultRefreshValues: {
           paths: []

src/resources/ssh/ssh-config-hosts-parameter.ts

@@ -33,16 +33,28 @@ export class SshConfigHostsParameter extends StatefulParameter<SshConfig, SshCon
       filterInStatelessMode(desired, current) {
         return current.filter((c) => desired.some((d) => SshConfigHostsParameter.isHostObjectSame(c, d)))
       },
-      inputTransformation: (hosts: SshConfigOptions[]) =>  hosts.map((h) => Object.fromEntries(
-        Object.entries(h)
-          .map(([k, v]) => [
-            k,
-            typeof v === 'boolean'
-              ? (v ? 'yes' : 'no') // The file takes 'yes' or 'no' instead of booleans
-              : v,
-          ])
-        )
-      )
+      transformation: {
+        to: (hosts: SshConfigOptions[]) =>  hosts.map((h) => Object.fromEntries(
+            Object.entries(h)
+              .map(([k, v]) => [
+                k,
+                typeof v === 'boolean'
+                  ? (v ? 'yes' : 'no') // The file takes 'yes' or 'no' instead of booleans
+                  : v,
+              ])
+          )
+        ),
+        from: (hosts: SshConfigOptions[]) => hosts.map((h) => Object.fromEntries(
+            Object.entries(h)
+              .map(([k, v]) => [
+                k,
+                v === 'yes' || v === 'no'
+                  ? (v === 'yes') // The file takes 'yes' or 'no' instead of booleans
+                  : v,
+              ])
+          )
+        ),
+      }
     }
   }