feat: Added default values for resources that already exist in the project and fixed bug with yoga memory management for large imports

Author: kevinwang5658

codify.json

@@ -12,13 +12,212 @@
       "hashicorp/tap",
       "homebrew/services"
     ],
-    "formulae": [
-      "asciinema"
-    ],
     "casks": [
-      "firefox"
+      "android-commandlinetools",
+      "android-studio",
+      "mitmproxy"
+    ],
+    "formulae": [
+      "ack",
+      "asciinema",
+      "ca-certificates",
+      "cairo",
+      "cirrus",
+      "expect",
+      "fontconfig",
+      "freetype",
+      "fribidi",
+      "gettext",
+      "ghostscript",
+      "giflib",
+      "git-lfs",
+      "glib",
+      "graphite2",
+      "groff",
+      "harfbuzz",
+      "hyperfine",
+      "icu4c",
+      "jasper",
+      "jbig2dec",
+      "jenv",
+      "jpeg-turbo",
+      "jq",
+      "krb5",
+      "leptonica",
+      "libarchive",
+      "libb2",
+      "libidn",
+      "libpaper",
+      "libpng",
+      "libpq",
+      "libtiff",
+      "libx11",
+      "libxau",
+      "libxcb",
+      "libxdmcp",
+      "libxext",
+      "libxfixes",
+      "libxi",
+      "libxrender",
+      "little-cms2",
+      "lz4",
+      "lzo",
+      "mas",
+      "mpdecimal",
+      "netpbm",
+      "oniguruma",
+      "openjdk@11",
+      "openjdk@17",
+      "openjpeg",
+      "openssl@3",
+      "packer",
+      "pango",
+      "pcre2",
+      "pgcli",
+      "pixman",
+      "postgresql@14",
+      "psutils",
+      "python-packaging",
+      "python@3.12",
+      "readline",
+      "softnet",
+      "sqlite",
+      "sshpass",
+      "tart",
+      "tcl-tk",
+      "tesseract",
+      "uchardet",
+      "webp",
+      "xorgproto",
+      "xz",
+      "zstd"
+    ]
+  },
+  {"version":"1.10.5","type":"terraform"},
+  { "type": "alias", "alias": "gcdsdd", "value": "git clone" },
+  {
+    "type": "ssh-config",
+    "hosts": [
+      {
+        "Host": "192.168.64.94",
+        "HostName": "192.168.64.94",
+        "User": "admin"
+      },
+      {
+        "Host": "192.168.2.48",
+        "HostName": "192.168.2.48",
+        "User": "pi"
+      },
+      {
+        "Host": "*",
+        "AddKeysToAgent": "yes",
+        "IdentityFile": "~/.ssh/id_ed25519"
+      },
+      {
+        "Host": "ec2",
+        "HostName": "54.82.78.202",
+        "User": "ec2-user",
+        "IdentityFile": "~/.ssh/ed25519"
+      },
+      {
+        "Host": "ec2-2",
+        "HostName": "35.153.180.154",
+        "User": "ec2-user",
+        "IdentityFile": "~/.ssh/ed25519"
+      }
     ]
   },
-  { "type": "terraform" },
-  { "type": "alias", "alias": "gcdsdd", "value": "git clone" }
+  {
+    "type": "ssh-key",
+    "fileName": "id_ed25519",
+    "passphrase": "",
+    "folder": "/Users/kevinwang/.ssh",
+    "keyType": "ed25519"
+  },
+  {
+    "type": "alias",
+    "alias": "gcc",
+    "value": "git commit -v"
+  },
+  {
+    "type": "alias",
+    "alias": "gc",
+    "value": "git commit -v"
+  },
+  {
+    "type": "pgcli"
+  },
+  {
+    "type": "aws-cli"
+  },
+  {
+    "type": "vscode",
+    "directory": "/Applications"
+  },
+  {
+    "type": "xcode-tools"
+  },
+  {
+    "type": "git-clone",
+    "autoVerifySSH": true,
+    "directory": "/Users/kevinwang/projects/codify",
+    "repository": "git@github.com:kevinwang5658/codify.git"
+  },
+  {
+    "type": "git-lfs"
+  },
+  {
+    "type": "pyenv",
+    "global": "3.11",
+    "pythonVersions": [
+      "3.9.19",
+      "3.10.14",
+      "3.11.8",
+      "3.12.2"
+    ]
+  },
+  {
+    "type": "git",
+    "email": "kevinwang5658@gmail.com",
+    "username": "kevinwang"
+  },
+  {
+    "type": "android-studio",
+    "directory": "/Applications",
+    "version": "2023.3.1.20"
+  },
+  {
+    "type": "nvm",
+    "global": "20.15.1",
+    "nodeVersions": [
+      "iojs-2.5.0",
+      "18.20.3",
+      "20.15.0",
+      "20.15.1",
+      "22.4.1",
+      "23.3.0"
+    ]
+  },
+  {
+    "type": "jenv",
+    "add": [
+      "system",
+      "11",
+      "11.0",
+      "11.0.24",
+      "17",
+      "17.0.12",
+      "openjdk64-11.0.24",
+      "openjdk64-17.0.12"
+    ],
+    "global": "17"
+  },
+  {
+    "type": "aws-profile",
+    "region": "us-west-2",
+    "awsAccessKeyId": "AKIATCKATKL55TT5UZ7P",
+    "awsSecretAccessKey": "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",
+    "output": "json",
+    "profile": "codify"
+  }
 ]

src/entities/project.ts

@@ -123,7 +123,15 @@ ${JSON.stringify(projectConfigs, null, 2)}`);
     return uninstallProject;
   }
 
-  findResource(type: string, name?: string): ResourceConfig | null {
+  findAll(type: string, name?: string): ResourceConfig[] {
+    return this.resourceConfigs.filter((r) =>
+      name
+        ? r.isSame(type, name)
+        : r.type === type
+    );
+  }
+
+  findSpecific(type: string, name?: string): ResourceConfig | null {
     return this.resourceConfigs.find((r) => r.isSame(type, name)) ?? null;
   }
 
@@ -157,7 +165,7 @@ ${JSON.stringify(projectConfigs, null, 2)}`);
     if (invalidResults.length > 0) {
       const resourceErrors: PluginValidationErrorParams = invalidResults.map((r,) => ({
         customErrorMessage: r.customValidationErrorMessage,
-        resource: this.findResource(r.resourceType, r.resourceName)!,
+        resource: this.findSpecific(r.resourceType, r.resourceName)!,
         schemaErrors: r.schemaValidationErrors,
       }))
 

src/entities/resource-info.ts

@@ -1,5 +1,7 @@
 import { GetResourceInfoResponseData } from 'codify-schemas';
 
+import { ResourceConfig } from './resource-config.js';
+
 interface ParameterInfo {
   name: string;
   type?: string;
@@ -15,6 +17,8 @@ export class ResourceInfo implements GetResourceInfoResponseData {
   dependencies?: string[] | undefined;
   import?: { requiredParameters: null | string[]; } | undefined;
 
+  private parametersCache?: ParameterInfo[];
+
   private constructor() {}
 
   get description(): string | undefined {
@@ -26,31 +30,47 @@ export class ResourceInfo implements GetResourceInfoResponseData {
     Object.assign(resourceInfo, data);
     return resourceInfo;
   }
+
+  attachDefaultValues(resource: ResourceConfig): void {
+    const parameterInfo = this.getParameterInfo();
+    parameterInfo.forEach((info) => {
+      const matchedParameter = resource.parameters[info.name];
+      if (matchedParameter) {
+        info.value = matchedParameter;
+      }
+    })
+  }
 
   getParameterInfo(): ParameterInfo[] {
-    const { schema } = this;
-    if (!schema || !schema.properties) {
-      return [];
-    }
+    if (!this.parametersCache) {
+      const { schema } = this;
+      if (!schema || !schema.properties) {
+        this.parametersCache = [];
+        return [];
+      }
+
+      const { properties, required } = schema;
+      if (!properties || typeof properties !== 'object') {
+        this.parametersCache = [];
+        return [];
+      }
+
+      this.parametersCache = Object.entries(properties)
+        .map(([propertyName, info]) => {
+          const isRequired = this.import?.requiredParameters?.some((name) => name === propertyName)
+            ?? (required as string[] | undefined)?.includes(propertyName)
+            ?? false;
 
-    const { properties, required } = schema;
-    if (!properties || typeof properties !== 'object') {
-      return [];
+          return {
+            name: propertyName,
+            type: info.type ?? null,
+            description: info.description,
+            isRequired
+          }
+        });
     }
 
-    return Object.entries(properties)
-      .map(([propertyName, info]) => {
-        const isRequired = this.import?.requiredParameters?.some((name) => name === propertyName)
-          ?? (required as string[] | undefined)?.includes(propertyName)
-          ?? false;
-
-        return {
-          name: propertyName,
-          type: info.type ?? null,
-          description: info.description,
-          isRequired
-        }
-      })
+    return this.parametersCache;
   }
 
   getRequiredParameters(): ParameterInfo[] {

src/orchestrators/import.ts

@@ -61,19 +61,9 @@ export class ImportOrchestrator {
     await ImportOrchestrator.validate(matchedTypes, project, pluginManager, typeIdsToDependenciesMap);
 
     const resourceInfoList = await pluginManager.getMultipleResourceInfo(matchedTypes);
-    // Figure out which resources we need to prompt the user for additional info (based on the resource info)
-    const [noPrompt, askPrompt] = resourceInfoList.reduce((result, info) => {
-      info.getRequiredParameters().length === 0 ? result[0].push(info) : result[1].push(info);
-      return result;
-    }, [<ResourceInfo[]>[], <ResourceInfo[]>[]])
 
-    const userSupplied = await reporter.promptUserForValues(askPrompt, PromptType.IMPORT);
-    
-    const valuesToImport = [
-      ...noPrompt.map((info) => new ResourceConfig({ type: info.type })),
-      ...userSupplied
-    ]
-    const importResult = await ImportOrchestrator.getImportedConfigs(pluginManager, valuesToImport)
+    const importParameters = await ImportOrchestrator.getImportParameters(reporter, project, resourceInfoList);
+    const importResult = await ImportOrchestrator.import(pluginManager, importParameters);
 
     ctx.processFinished(ProcessName.IMPORT)
     reporter.displayImportResult(importResult, false);
@@ -84,7 +74,7 @@ export class ImportOrchestrator {
     await ImportOrchestrator.saveResults(reporter, importResult, project, resourceInfoList)
   }
 
-  static async getImportedConfigs(
+  static async import(
     pluginManager: PluginManager,
     resources: ResourceConfig[],
   ): Promise<ImportResult> {
@@ -165,6 +155,28 @@ ${JSON.stringify(unsupportedTypeIds)}`);
     ctx.subprocessFinished(SubProcessName.VALIDATE)
   }
 
+  private static async getImportParameters(reporter: Reporter, project: Project, resourceInfoList: ResourceInfo[]): Promise<Array<ResourceConfig>> {
+    // Figure out which resources we need to prompt the user for additional info (based on the resource info)
+    const [noPrompt, askPrompt] = resourceInfoList.reduce((result, info) => {
+      info.getRequiredParameters().length === 0 ? result[0].push(info) : result[1].push(info);
+      return result;
+    }, [<ResourceInfo[]>[], <ResourceInfo[]>[]])
+
+    askPrompt.forEach((info) => {
+      const matchedResources = project.findAll(info.type);
+      if (matchedResources.length > 0) {
+        info.attachDefaultValues(matchedResources[0]);
+      }
+    })
+
+    const userSupplied = await reporter.promptUserForValues(askPrompt, PromptType.IMPORT);
+
+    return [
+      ...noPrompt.map((info) => new ResourceConfig({ type: info.type })),
+      ...userSupplied
+    ]
+  }
+
   private static async saveResults(reporter: Reporter, importResult: ImportResult, project: Project, resourceInfoList: ResourceInfo[]): Promise<void> {
     const projectExists = !project.isEmpty();
     const multipleCodifyFiles = project.codifyFiles.length > 1;