Fixed tests to use testSpawn. Fixed alias resource.

Author: kevinwang5658

.cirrus.yml

@@ -12,7 +12,7 @@ run_dev_task:
   run_script:
     - sleep 2000
 
-integration_test_dev_task:
+integration_test_dev_macos_task:
   macos_instance:
     image: codify-test-vm
   node_modules_cache:
@@ -24,7 +24,7 @@ integration_test_dev_task:
 
 integration_test_dev_linux_task:
   arm_container:
-    image: node:22
+    image: kevinwang5658/codify-test-linux:latest
 #  node_modules_cache:
 #    folder: node_modules
 #    fingerprint_script: cat package-lock.json
@@ -35,7 +35,7 @@ integration_test_dev_linux_task:
     - npm ci
     - npm run test:integration -- --disable-console-intercept $DEBUG --no-file-parallelism
 
-integration_individual_test_task:
+integration_individual_test_macos_task:
   macos_instance:
     image: codify-test-vm
   node_modules_cache:

.run/test_integration_dev_linux.run.xml

@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test:integration:dev:linux" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="test:integration:dev" />
+    </scripts>
+    <arguments value="-- --operatingSystem=linux" />
+    <node-interpreter value="project" />
+    <envs />
+    <EXTENSION ID="com.intellij.javascript.debugger.execution.StartBrowserRunConfigurationExtension">
+      <browser with-js-debugger="true" />
+    </EXTENSION>
+    <method v="2" />
+  </configuration>
+</component>

package-lock.json

@@ -55,7 +55,7 @@
     "@types/node": "^18",
     "@types/plist": "^3.0.5",
     "@types/semver": "^7.5.4",
-    "codify-plugin-test": "0.0.53-beta11",
+    "codify-plugin-test": "0.0.53-beta14",
     "commander": "^12.1.0",
     "eslint": "^8.51.0",
     "eslint-config-oclif": "^5",

package.json

@@ -2,44 +2,50 @@ import { Command } from 'commander';
 import { glob } from 'glob';
 import { spawn, spawnSync } from 'node:child_process';
 import * as inspector from 'node:inspector';
+import os from 'node:os';
 
 const IP_REGEX = /VM was assigned with (.*) IP/;
 
 const program = new Command();
 
 program
+  .option('--operatingSystem <operatingSystem>', 'Operating system to run tests on', os.platform())
   .argument('[file]', 'File to run')
   .action(main)
   .parse()
 
-async function main(argument: string): Promise<void> {
+async function main(argument: string, operatingSystem: string): Promise<void> {
   const debug = isInDebugMode();
   if (debug) {
     console.log('Running in debug mode!')
   }
 
   if (!argument) {
-    await launchTestAll(debug)
+    await launchTestAll(debug, operatingSystem)
     return process.exit(0);
   }
 
-  await launchSingleTest(argument, debug);
+  await launchSingleTest(argument, debug, operatingSystem);
   process.exit(0);
 }
 
-async function launchTestAll(debug: boolean): Promise<void> {
+async function launchTestAll(debug: boolean, operatingSystem: string): Promise<void> {
+  const image = operatingSystem === 'darwin' ? 'integration_individual_test_macos' : 'integration_individual_test_linux';
+
   const tests = await glob('./test/**/*.test.ts');
   for (const test of tests) {
     console.log(`Running test ${test}`)
-    await run(`cirrus run --lazy-pull integration_individual_test_linux -e FILE_NAME="${test}" ${ debug ? '-o simple' : ''}`, debug, false)
+    await run(`cirrus run --lazy-pull ${image} -e FILE_NAME="${test}" ${ debug ? '-o simple' : ''}`, debug, false)
   }
 
   // await run('cirrus run --lazy-pull integration_test_dev -o simple', debug, false);
 }
 
-async function launchSingleTest(test: string, debug: boolean) {
+async function launchSingleTest(test: string, debug: boolean, operatingSystem: string) {
+  const image = operatingSystem === 'darwin' ? 'integration_individual_test_macos' : 'integration_individual_test_linux';
+
   console.log(`Running test: ${test}`)
-  await run(`cirrus run --lazy-pull integration_individual_test -e FILE_NAME="${test}" -o simple`, debug)
+  await run(`cirrus run --lazy-pull ${image} -e FILE_NAME="${test}" -o simple`, debug)
 }
 
 async function run(cmd: string, debug: boolean, simple = true) {

scripts/run-tests.ts

@@ -12,7 +12,7 @@ export class Npm extends Resource<NpmConfig> {
   getSettings(): ResourceSettings<NpmConfig> {
     return {
       id: 'npm',
-      operatingSystems: [OS.Darwin],
+      operatingSystems: [OS.Darwin, OS.Linux],
       schema,
       parameterSettings: {
         globalInstall: { type: 'stateful', definition: new NpmGlobalInstallParameter() },

src/resources/javascript/npm/npm.ts

@@ -18,7 +18,7 @@ export class NvmResource extends Resource<NvmConfig> {
   getSettings(): ResourceSettings<NvmConfig> {
     return {
       id: 'nvm',
-      operatingSystems: [OS.Darwin],
+      operatingSystems: [OS.Darwin, OS.Linux],
       schema: Schema,
       parameterSettings: {
         global: { type: 'stateful', definition: new NvmGlobalParameter(), order: 2 },
@@ -54,8 +54,10 @@ export class NvmResource extends Resource<NvmConfig> {
     if (installResult.includes(`nvm source string already in ${shellRc}`)
       && (await $.spawnSafe('which nvm', { interactive: true })).status === SpawnStatus.ERROR
     ) {
-      await FileUtils.addToStartupFile('export NVM_DIR="$HOME/.nvm"')
-      await FileUtils.addToStartupFile('[ -s "$NVM_DIR/nvm.sh" ] && \\. "$NVM_DIR/nvm.sh" ');
+      await FileUtils.addAllToStartupFile([
+        'export NVM_DIR="$HOME/.nvm"',
+        '[ -s "$NVM_DIR/nvm.sh" ] && \\. "$NVM_DIR/nvm.sh"'
+      ])
     }
   }
 

src/resources/javascript/nvm/nvm.ts

@@ -19,7 +19,7 @@ export class PyenvResource extends Resource<PyenvConfig> {
   getSettings(): ResourceSettings<PyenvConfig> {
     return {
       id: 'pyenv',
-      operatingSystems: [OS.Darwin],
+      operatingSystems: [OS.Darwin, OS.Linux],
       schema: Schema,
       parameterSettings: {
         global: { type: 'stateful', definition: new PyenvGlobalParameter(), order: 2 },

src/resources/python/pyenv/pyenv.ts

@@ -49,25 +49,24 @@ export class AliasResource extends Resource<AliasConfig> {
       .find((l) => {
         const firstEqualIndex = l.indexOf('=');
         const name = l.slice(0, firstEqualIndex);
-        return name === desired;
+        return name.endsWith(desired!);
       });
 
     if (!matchedAlias) {
       return null;
     }
 
-    const firstEqualIndex = matchedAlias.indexOf('=');
-    const name = matchedAlias.slice(0, firstEqualIndex);
-    const value = matchedAlias.slice(firstEqualIndex + 1);
-
-    let processedValue = value.trim()
-    if ((processedValue.startsWith('\'') && processedValue.endsWith('\'')) || (processedValue.startsWith('"') && processedValue.endsWith('"'))) {
-      processedValue = processedValue.slice(1, -1)
+    const aliasMatch = matchedAlias.match(/^(?:alias\s+)?([^=]+)='?(.*?)'?$/);
+    if (!aliasMatch) {
+      return null;
     }
 
+    const name = aliasMatch[1].trim();
+    const value = aliasMatch[2].trim();
+
     return {
       alias: name,
-      value: processedValue,
+      value,
     }
   }
 
@@ -81,10 +80,7 @@ export class AliasResource extends Resource<AliasConfig> {
     const { alias, value } = plan.desiredConfig;
     const aliasString = this.aliasString(alias, value);
 
-    const file = await fs.readFile(shellRcPath, 'utf8');
-    const fileWithAlias = FileUtils.appendToFileWithSpacing(file, aliasString);
-
-    await fs.writeFile(shellRcPath, fileWithAlias, { encoding: 'utf8' });
+    await FileUtils.addToStartupFile(aliasString);
   }
 
   async modify(pc: ParameterChange<AliasConfig>, plan: ModifyPlan<AliasConfig>): Promise<void> {

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

@@ -1,14 +1,14 @@
-import { CreatePlan, getPty, Resource, ResourceSettings, SpawnStatus } from 'codify-plugin-lib';
+import { CreatePlan, Resource, ResourceSettings, SpawnStatus, getPty } from 'codify-plugin-lib';
 import { OS, StringIndexedObject } from 'codify-schemas';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
 import semver from 'semver';
 
 import { FileUtils } from '../../utils/file-utils.js';
 import { Utils } from '../../utils/index.js';
 import Schema from './terraform-schema.json';
 import { HashicorpReleaseInfo, HashicorpReleasesAPIResponse, TerraformVersionInfo } from './terraform-types.js';
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import os from 'node:os';
 
 const TERRAFORM_RELEASES_API_URL = 'https://api.releases.hashicorp.com/v1/releases/terraform';
 const TERRAFORM_RELEASE_INFO_API_URL = (version: string) => `https://api.releases.hashicorp.com/v1/releases/terraform/${version}`;
@@ -146,9 +146,9 @@ ${JSON.stringify(releaseInfo, null, 2)}
 
   private async getDownloadUrl(releaseInfo: HashicorpReleaseInfo, isArm: boolean): Promise<null | string> {
     const arch = isArm ? 'arm64' : 'amd64';
-    const os = 'darwin';
+    const osParam = os.platform() === 'darwin' ? 'darwin' : 'linux';
 
-    const build = releaseInfo.builds.find((b) => b.arch === arch && b.os === os);
+    const build = releaseInfo.builds.find((b) => b.arch === arch && b.os === osParam);
     if (!build) {
       return null;
     }