WIP: fixed the test command and added a promptSecret to collect the user's password initially

Author: kevinwang5658

src/orchestrators/test.ts

@@ -10,6 +10,7 @@ import { sleep } from '../utils/index.js';
 import { spawn, spawnSafe } from '../utils/spawn.js';
 import { PlanOrchestrator, PlanOrchestratorResponse } from './plan.js';
 import { ValidateOrchestrator } from './validate.js';
+import { FileUtils } from '../utils/file.js';
 
 export interface TestArgs {
   path?: string;
@@ -25,12 +26,14 @@ export const TestOrchestrator = {
 
     ctx.subprocessStarted(SubProcessName.TEST_INITIALIZE_AND_VALIDATE);
     // Perform validation initially to ensure the project is valid
-    const initializationResult = await PluginInitOrchestrator.run({ ...args, noProgress: true }, new StubReporter());
-    await ValidateOrchestrator.run({ existing: initializationResult, noProgress: true }, new StubReporter());
+    const initializationResult = await PluginInitOrchestrator.run({ ...args, noProgress: true }, reporter);
+    await ValidateOrchestrator.run({ existing: initializationResult, noProgress: true }, reporter);
     ctx.subprocessFinished(SubProcessName.TEST_INITIALIZE_AND_VALIDATE);
 
     await this.ensureVmIsInstalled(reporter, args.vmOs);
 
+    const password = await reporter.promptSecret('Password needed to copy Codify installation to VM...');
+
     ctx.subprocessStarted(SubProcessName.TEST_STARTING_VM);
     const baseVmName = args.vmOs === OS.Darwin ? 'codify-test-vm-macos' : 'codify-test-vm-linux';
     const vmName = this.generateVmName();
@@ -49,7 +52,7 @@ export const TestOrchestrator = {
         console.log('VM has been killed... exiting.')
         process.exit(1);
       })
-    await sleep(10_000);
+    await sleep(5_000);
     await this.waitUntilVmIsReady(vmName);
 
     ctx.subprocessFinished(SubProcessName.TEST_STARTING_VM);
@@ -58,12 +61,25 @@ export const TestOrchestrator = {
     // Install codify on the VM
     // await spawn(`tart exec ${vmName} /bin/bash -c "$(curl -fsSL https://releases.codifycli.com/install.sh)"`, { interactive: true });
     const { data: ip } = await spawnSafe(`tart ip ${vmName}`, { interactive: true });
-    await spawn(`sshpass -p "admin" scp -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${initializationResult.project.codifyFiles[0]} admin@${ip}:~/codify.jsonc`, { interactive: true });
 
-    if (args.vmOs === OS.Darwin) {
-      await spawn(`tart exec ${vmName} osascript -e "tell application \\"Terminal\\" to do script \\"cd ~/ && codify apply\\""`, { interactive: true });
-    } else {
-      await spawn(`tart exec ${vmName} gnome-terminal -- bash -c "cd ~/ && codify apply"`, { interactive: true });
+    await spawn(`sshpass -p "admin" rsync -avz -e 'ssh -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' /usr/local/lib/codify admin@${ip}:~/codify-lib`, { requiresRoot: true }, undefined, password);
+
+    if (await FileUtils.dirExists('~/.local/share/codify')) {
+      await spawn(`sshpass -p "admin" rsync -avz -e 'ssh -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' ~/.local/share/codify admin@${ip}:~/.local/share/codify`, { interactive: true });
+    }
+
+    try {
+      await spawn(`tart exec ${vmName} sudo mv /Users/admin/codify-lib /usr/local/lib`, { interactive: true });
+      await spawn(`tart exec ${vmName} sudo ln -s /usr/local/lib/codify/bin/codify /usr/local/bin/codify`, { interactive: true });
+      await spawn(`sshpass -p "admin" scp -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${initializationResult.project.codifyFiles[0]} admin@${ip}:~/codify.jsonc`, { interactive: true });
+
+      if (args.vmOs === OS.Darwin) {
+        await spawn(`tart exec ${vmName} osascript -e "tell application \\"Terminal\\" to do script \\"cd ~/ && codify apply\\""`, { interactive: true });
+      } else {
+        await spawn(`tart exec ${vmName} gnome-terminal -- bash -c "cd ~/ && codify apply"`, { interactive: true });
+      }
+    } catch (e) {
+      ctx.log(`Error copying files to VM: ${e}`);
     }
 
     ctx.subprocessFinished(SubProcessName.TEST_COPYING_OVER_CONFIGS_AND_OPENING_TERMINAL);

src/ui/components/default-component.tsx

@@ -89,6 +89,16 @@ export function DefaultComponent(props: {
         </Box>
       )
     }
+    {
+      renderStatus === RenderStatus.SECRET_PROMPT && (
+        <Box flexDirection="column">
+          <Text>{renderData as string}</Text>
+          <PasswordInput isDisabled={disableSudoPrompt} onSubmit={(password) => {
+            emitter.emit(RenderEvent.PROMPT_RESULT, password);
+          }}/>
+        </Box>
+      )
+    }
     {
       renderStatus === RenderStatus.SUDO_PROMPT && (
         <Box flexDirection="column">

src/ui/reporters/default-reporter.tsx

@@ -38,7 +38,7 @@ const ProgressLabelMapping = {
   [SubProcessName.TEST_INITIALIZE_AND_VALIDATE]: 'Initializing and validating your configs',
   [SubProcessName.TEST_CHECKING_VM_INSTALLED]: 'Checking if VM is installed',
   [SubProcessName.TEST_STARTING_VM]: 'Starting VM',
-  [SubProcessName.TEST_COPYING_OVER_CONFIGS_AND_OPENING_TERMINAL]: 'Copying over configs and opening terminal',
+  [SubProcessName.TEST_COPYING_OVER_CONFIGS_AND_OPENING_TERMINAL]: 'Copying over configs and opening terminal (if a confirmation dialog appears within the VM, please confirm it.)',
   [SubProcessName.TEST_USER_CONTINUE_ON_VM]: 'Done setup! Please continue on the VM UI',
   [SubProcessName.TEST_DELETING_VM]: 'Deleting VM',
 }
@@ -189,6 +189,16 @@ export class DefaultReporter implements Reporter {
     return password;
   }
 
+  async promptSecret(prompt: string): Promise<string | undefined> {
+    const password = await this.updateStateAndAwaitEvent<string>(
+      () => this.updateRenderState(RenderStatus.SECRET_PROMPT, prompt),
+      RenderEvent.PROMPT_RESULT,
+    );
+
+    await this.displayProgress();
+    return password;
+  }
+
   displayPlan(plan: Plan): void {
     this.updateRenderState(RenderStatus.DISPLAY_PLAN, plan)
   }

src/ui/reporters/json-reporter.ts

@@ -47,6 +47,10 @@ export class JsonReporter implements Reporter {
     throw new Error(`Json reporter error: sudo required for command: ${data.command}. Make sure to preconfigure the sudo password for the Json reporter using --sudoPassword`);
   }
 
+  promptSecret(prompt: string): Promise<string | undefined> {
+    throw new Error('Json reporter error: cannot prompt user for values while using Json reporter. Use a different reporter.');
+  }
+
   async promptUserForValues(): Promise<ResourceConfig[]> {
     throw new Error('Json reporter error: cannot prompt user for values while using Json reporter. Use a different reporter.');
   }

src/ui/reporters/plain-reporter.ts

@@ -106,6 +106,12 @@ export class PlainReporter implements Reporter {
     return result;
   }
 
+  async promptSecret(prompt: string): Promise<string | undefined> {
+    return new Promise((resolve) => {
+      this.rl.question(`${prompt} (leave empty if not needed) `, (answer) => resolve(answer));
+    });
+  }
+
   async displayProgress(): Promise<void> {}
 
   async promptInput(prompt: string, error?: string): Promise<string> {

src/ui/reporters/reporter.ts

@@ -64,6 +64,8 @@ export interface Reporter {
 
   promptSudo(pluginName: string, data: CommandRequestData, secureMode: boolean): Promise<string | undefined>;
 
+  promptSecret(prompt: string): Promise<string | undefined>;
+
   promptUserForValues(resources: Array<ResourceInfo>, promptType: PromptType): Promise<ResourceConfig[]>;
 
   promptPressKeyToContinue(message?: string): Promise<void>;

src/ui/reporters/stub-reporter.ts

@@ -17,6 +17,7 @@ export class StubReporter implements Reporter {
     async promptConfirmation(message: string): Promise<boolean> { return true; }
     async promptOptions(message: string, options: string[]): Promise<number> { throw new Error('Method not implemented.'); }
     async promptSudo(pluginName: string, data: CommandRequestData): Promise<string | undefined> { throw new Error('Method not implemented.'); }
+    async promptSecret(prompt: string): Promise<string | undefined> { throw new Error('Method not implemented.'); }
     async promptUserForValues(resources: Array<ResourceInfo>, promptType: PromptType): Promise<ResourceConfig[]> { throw new Error('Method not implemented.'); }
     async promptPressKeyToContinue(message?: string): Promise<void> {}
     async displayImportResult(importResult: ImportResult): Promise<void> {}

src/ui/store/index.ts

@@ -22,6 +22,7 @@ export enum RenderStatus {
   PROMPT_INPUT,
   PROMPT_PRESS_KEY_TO_CONTINUE,
   SUDO_PROMPT,
+  SECRET_PROMPT,
   DISPLAY_MESSAGE,
 }
 

src/utils/file.ts

@@ -22,6 +22,18 @@ export class FileUtils {
     }
   }
 
+  static async dirExists(dirPath: string, throwIfExistsButNotFile = true): Promise<boolean> {
+    try {
+      const result = await fs.lstat(path.resolve(dirPath))
+      if (throwIfExistsButNotFile && !result.isDirectory()) {
+        throw new Error(`File found at ${dirPath} instead of a file`)
+      }
+      return true;
+    } catch(e) {
+      return false;
+    }
+  }
+
   static async isDir(fileOrDir: string): Promise<boolean> {
     const lstat = await fs.lstat(path.resolve(fileOrDir))
     return lstat.isDirectory()

src/utils/spawn.ts

@@ -37,9 +37,9 @@ export async function spawnSafe(cmd: string, options?: SpawnOptions, pluginName?
     throw new Error('Password must be specified!');
   }
 
-  if (cmd.toLowerCase().includes('sudo')) {
-    throw new Error(`Command must not include sudo. Plugin (${pluginName})`)
-  }
+  // if (cmd.toLowerCase().includes('sudo')) {
+  //   throw new Error(`Command must not include sudo. Plugin (${pluginName})`)
+  // }
 
   if (pluginName) {
     ctx.pluginStdout(pluginName, `Running command: ${options?.requiresRoot ? 'sudo' : ''} ${cmd}` + (options?.cwd ? `(${options?.cwd})` : ''))
@@ -65,13 +65,8 @@ export async function spawnSafe(cmd: string, options?: SpawnOptions, pluginName?
     const initialCols = process.stdout.columns ?? 80;
     const initialRows = process.stdout.rows ?? 24;
 
-    // Mac OS uses -SN instead of -Sn
-    let command;
-    if (OsUtils.isMacOS()) {
-      command = options?.requiresRoot ? `sudo -k >/dev/null 2>&1; sudo -SN <<< "${password}" -E ${ShellUtils.getDefaultShell()} ${options?.interactive ? '-i' : ''} -c "${cmd.replaceAll('\'', '\\\'')}"` : cmd;
-    } else {
-      command = options?.requiresRoot ? `sudo -k >/dev/null 2>&1; sudo -S <<< "${password}" -E ${ShellUtils.getDefaultShell()} ${options?.interactive ? '-i' : ''} -c '${cmd.replaceAll('\'', '\\\'')}'` : cmd;
-    }
+    const command = options?.requiresRoot ? `sudo -k >/dev/null 2>&1; sudo -S <<< "${password}" -E ${ShellUtils.getDefaultShell()} ${options?.interactive ? '-i' : ''} -c "${cmd.replaceAll('"', '\\"')}"` : cmd;
+    console.log(command);
 
     const args = options?.interactive ? ['-i', '-c', command] : ['-c', command]