Fixed resources for linux (ubuntu)

Author: kevinwang5658

.cirrus.yml

@@ -52,14 +52,16 @@ integration_individual_test_macos_task:
     - zsh -i -c "npm run test -- $FILE_NAME --disable-console-intercept $DEBUG --no-file-parallelism"
 
 integration_individual_test_linux_task:
-  arm_container:
-    image: kevinwang5658/codify-test-linux:latest
+  # trick cirrus CI to use tart here to run a linux instance
+  macos_instance:
+    image: codify-test-vm-linux
 #  node_modules_cache:
 #    folder: node_modules
 #    fingerprint_script: cat package-lock.json
 #    populate_script: npm ci
   test_script:
-    - chown -R node /tmp/cirrus-ci/working-dir
-    - su node -c "npm install"
+#    - chown -R node /tmp/cirrus-ci/working-dir
+#    - su node -c "npm install"
     - echo $FILE_NAME
-    - su node -c "npm run test -- $FILE_NAME --disable-console-intercept $DEBUG --no-file-parallelism"
+    - npm ci
+    - npm run test -- $FILE_NAME --disable-console-intercept $DEBUG --no-file-parallelism

package-lock.json

@@ -26,7 +26,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "chalk": "^5.3.0",
-    "codify-plugin-lib": "1.0.182-beta57",
+    "codify-plugin-lib": "1.0.182-beta64",
     "codify-schemas": "1.0.86-beta7",
     "debug": "^4.3.4",
     "lodash.isequal": "^4.5.0",
@@ -55,7 +55,7 @@
     "@types/node": "^18",
     "@types/plist": "^3.0.5",
     "@types/semver": "^7.5.4",
-    "codify-plugin-test": "0.0.53-beta23",
+    "codify-plugin-test": "0.0.53-beta24",
     "commander": "^12.1.0",
     "eslint": "^8.51.0",
     "eslint-config-oclif": "^5",

package.json

@@ -20,7 +20,11 @@ program
   .action(main)
   .parse()
 
-async function main(argument: string, args: { operatingSystem: string; persistent: boolean; launchPersistent: boolean }): Promise<void> {
+async function main(argument: string, args: {
+  operatingSystem: string;
+  persistent: boolean;
+  launchPersistent: boolean
+}): Promise<void> {
   const debug = isInDebugMode();
   if (debug) {
     console.log('Running in debug mode!')
@@ -72,31 +76,29 @@ async function launchPersistentTest(test: string, debug: boolean, operatingSyste
   const shell = operatingSystem === 'darwin' ? 'zsh' : 'bash';
 
   // if (operatingSystem === 'darwin') {
-    const { data: vmList } = await codifySpawn('tart list --format json');
-    console.log(vmList);
+  const { data: vmList } = await codifySpawn('tart list --format json');
+  console.log(vmList);
 
-    const parsedVmList = JSON.parse(vmList);
-    const runningVm = parsedVmList.find(vm => vm.Name.startsWith('codify-test-vm') && vm.Running === true);
-    if (!runningVm) {
-      throw new Error('No persistent VM found');
-    }
+  const parsedVmList = JSON.parse(vmList);
+  const runningVm = parsedVmList.find(vm => vm.Name.startsWith('codify-test-vm') && vm.Running === true);
+  if (!runningVm) {
+    throw new Error('No persistent VM found');
+  }
 
-    const vmName = runningVm.Name;
-    const dir = '~/codify-homebrew-plugin';
-    // const dir = '/Volumes/My\\ Shared\\ Files/plugin'
+  const vmName = runningVm.Name;
+  const dir = '~/codify-homebrew-plugin';
+  // const dir = '/Volumes/My\\ Shared\\ Files/plugin'
 
-    const debugFlag = debug ? ' -e DEBUG="--inspect-brk=9229"' : ''
+  const debugFlag = debug ? ' -e DEBUG="--inspect-brk=9229"' : ''
 
-    console.log('Refreshing files on VM...');
-    const { data: ipAddr } = await testSpawn(`tart ip ${vmName}`);
-    await testSpawn(`tart exec ${vmName} rm -rf ${dir}/src`);
-    await testSpawn(`tart exec ${vmName} rm -rf ${dir}/test`);
-    await testSpawn(`sshpass -p "admin" scp -r -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${path.join(process.cwd(), 'test')} admin@${ipAddr}:${dir}/test`);
-    await testSpawn(`sshpass -p "admin" scp -r -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${path.join(process.cwd(), 'src')} admin@${ipAddr}:${dir}/src`);
+  console.log('Refreshing files on VM...');
+  const { data: ipAddr } = await testSpawn(`tart ip ${vmName}`);
+  await testSpawn(`tart exec ${vmName} rm -rf ${dir}/src ${dir}/test`, { throws: true });
+  await testSpawn(`sshpass -p "admin" scp -r -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${path.join(process.cwd(), 'test')} ${path.join(process.cwd(), 'src')} ${path.join(process.cwd(), 'package.json')} ${path.join(process.cwd(), 'package-lock.json')} admin@${ipAddr}:${dir}`, { throws: true });
 
-    console.log('Done refreshing files on VM. Starting tests...');
-    VerbosityLevel.set(3);
-    await codifySpawn(`tart exec ${vmName} ${shell} -c ${operatingSystem === 'darwin' ? '-i' : ''} "cd ${dir} && FORCE_COLOR=true npm run test -- ${test} --disable-console-intercept ${debugFlag} --no-file-parallelism"`, { throws: false });
+  console.log('Done refreshing files on VM. Starting tests...');
+  VerbosityLevel.set(3);
+  await codifySpawn(`tart exec ${vmName} ${shell} -c ${operatingSystem === 'darwin' ? '-i' : ''} "cd ${dir} && FORCE_COLOR=true npm run test -- ${test} --disable-console-intercept ${debugFlag} --no-file-parallelism"`, { throws: false });
   // }
 }
 
@@ -125,6 +127,7 @@ async function launchPersistentVm(operatingSystem: string) {
   console.log('Finished installing dependencies. Start tests in a new terminal window.');
 
   await sleep(1_000_000_000);
+
   // This is effective the end just without a return
 
   async function cleanupVm() {

scripts/run-tests.ts

@@ -16,6 +16,7 @@ export class AptResource extends Resource<AptConfig> {
       id: 'apt',
       operatingSystems: [OS.Linux],
       schema,
+      removeStatefulParametersBeforeDestroy: true,
       parameterSettings: {
         install: { type: 'stateful', definition: new AptInstallParameter() },
         update: { type: 'boolean', default: true, setting: true }
@@ -45,6 +46,6 @@ export class AptResource extends Resource<AptConfig> {
 
   override async destroy(): Promise<void> {
     // apt is a core system component and should not be removed
-    throw new Error('apt cannot be destroyed as it is a core system package manager');
+    console.warn('apt cannot be destroyed as it is a core system package manager');
   }
 }

src/resources/apt/apt.ts

@@ -104,7 +104,7 @@ export class AptInstallParameter extends StatefulParameter<AptConfig, Array<AptP
       return p.name;
     }).join(' ');
 
-    await $.spawn(`apt-get install -y ${toInstall}`, { requiresRoot: true, interactive: true });
+    await $.spawn(`apt-get install -y ${toInstall}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' }});
   }
 
   private async uninstall(packages: Array<AptPackage | string>): Promise<void> {
@@ -121,7 +121,7 @@ export class AptInstallParameter extends StatefulParameter<AptConfig, Array<AptP
       return p.name;
     }).join(' ');
 
-    await $.spawn(`apt-get remove -y ${toUninstall}`, { requiresRoot: true, interactive: true });
+    await $.spawn(`apt-get auto-remove -y  ${toUninstall}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' }});
   }
 
   isSamePackage(a: AptPackage | string, b: AptPackage | string): boolean {

src/resources/apt/install-parameter.ts

@@ -55,7 +55,7 @@ export class AsdfResource extends Resource<AsdfConfig> {
       const asdfDir = path.join(os.homedir(), '.local', 'bin');
       await fs.mkdir(asdfDir, { recursive: true });
       const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'codify-asdf'));
-      const arch = Utils.isLinux() ? 'amd64' : 'arm64';
+      const arch = (await Utils.isArmArch()) ? 'arm64' : 'amd64';
 
       // Download and extract asdf
       await $.spawn(`curl -Lo ${tmpDir}/asdf.tar.gz "https://github.com/asdf-vm/asdf/releases/download/${latestVersion}/asdf-${latestVersion}-linux-${arch}.tar.gz"`, { cwd: tmpDir });

src/resources/asdf/asdf.ts

@@ -1,4 +1,4 @@
-import { Resource, ResourceSettings, getPty, SpawnStatus, Utils } from 'codify-plugin-lib';
+import { Resource, ResourceSettings, SpawnStatus, Utils, getPty, FileUtils } from 'codify-plugin-lib';
 import { OS, StringIndexedObject } from 'codify-schemas';
 import fs from 'node:fs/promises';
 import os from 'node:os';
@@ -75,7 +75,13 @@ softwareupdate --install-rosetta
     } else if (Utils.isLinux()) {
       const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'codify-aws-cli'));
 
-      await $.spawn('curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"', { cwd: tmpDir });
+      // Detect architecture and use appropriate download link
+      const downloadUrl = isArmArch
+        ? 'https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip'
+        : 'https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip';
+
+      console.log(`Installing AWS CLI for Linux (${isArmArch ? 'ARM64' : 'x86_64'})...`);
+      await FileUtils.downloadFile(downloadUrl, path.join(tmpDir, 'awscliv2.zip'));
       await $.spawn('unzip -q awscliv2.zip', { cwd: tmpDir });
       await $.spawn('./aws/install', { cwd: tmpDir, requiresRoot: true });
       await fs.rm(tmpDir, { recursive: true, force: true });
@@ -95,9 +101,9 @@ softwareupdate --install-rosetta
       return;
     }
 
-    await $.spawn(`rm ${installLocation}`, { requiresRoot: true });
-    await $.spawn(`rm ${installLocation}_completer`, { requiresRoot: true });
-    await $.spawn('rm -rf $HOME/.aws/');
+    await $.spawnSafe(`rm ${installLocation}`, { requiresRoot: true });
+    await $.spawnSafe(`rm ${installLocation}_completer`, { requiresRoot: true });
+    await $.spawnSafe('rm -rf $HOME/.aws/');
   }
 
   private async findInstallLocation(): Promise<null | string> {