Undo un-needed changes

Author: kevinwang5658

src/orchestrators/test.ts

@@ -1,6 +1,7 @@
 
 import { OS, SpawnStatus } from 'codify-schemas';
 import os from 'node:os';
+import fs from 'node:fs'
 import path from 'node:path';
 
 import { PluginInitOrchestrator } from '../common/initialize-plugins.js';
@@ -71,9 +72,12 @@ export const TestOrchestrator = {
       // Add symlinks to the bind mount locations.
       await spawn(`tart exec ${vmName} sudo ln -s /Volumes/My\\ Shared\\ Files/codify-lib/bin/codify /usr/local/bin/codify`, { interactive: true });
       await spawn(`tart exec ${vmName} ln -s /Volumes/My\\ Shared\\ Files/codify-config/${path.basename(initializationResult.project.codifyFiles[0])} /Users/admin/codify.jsonc`, { 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 });
 
+      // Launch terminal and run codify apply
       await (args.vmOs === OS.Darwin ? spawn(`tart exec ${vmName} osascript -e "tell application \\"Terminal\\" to do script \\"cd ~ && codify apply\\""`, { interactive: true }) : spawn(`tart exec ${vmName} gnome-terminal -- bash -c "cd ~/ && codify apply"`, { interactive: true }));
+
+      this.watchAndSyncFileChanges(initializationResult.project.codifyFiles[0], ip);
+
     } catch (error) {
       ctx.log(`Error copying files to VM: ${error}`);
     }
@@ -148,5 +152,28 @@ export const TestOrchestrator = {
 
       await sleep(1000);
     }
+  },
+
+  watchAndSyncFileChanges(filePath: string, ip: string): void {
+    const watcher = fs.watch(filePath, { persistent: false }, async (eventType) => {
+      if (eventType === 'change') {
+        ctx.log('Config file changed, syncing to VM...');
+        try {
+          // Copy the updated config file to the VM
+          // This command will fail but it causes the bind mount to update for some reason. (seems like a bug in Tart). Leave this here for now.
+          await spawn(`sshpass -p "admin" scp -o PubkeyAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${filePath} admin@${ip}:~/codify.jsonc`, { interactive: true });
+          // ctx.log('Config file synced successfully');
+        } catch (error) {
+          // ctx.log(`Error syncing config file: ${error}`);
+        }
+      }
+    });
+
+    // Clean up the watcher when the process finishes
+    const cleanupWatcher = () => {
+      watcher.close();
+    };
+
+    process.once('exit', cleanupWatcher);
   }
 };

src/ui/components/default-component.tsx

@@ -89,16 +89,6 @@ 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

@@ -189,16 +189,6 @@ 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,10 +47,6 @@ 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,12 +106,6 @@ 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,8 +64,6 @@ 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,7 +17,6 @@ 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,7 +22,6 @@ export enum RenderStatus {
   PROMPT_INPUT,
   PROMPT_PRESS_KEY_TO_CONTINUE,
   SUDO_PROMPT,
-  SECRET_PROMPT,
   DISPLAY_MESSAGE,
 }
 

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})` : ''))
@@ -66,8 +66,6 @@ export async function spawnSafe(cmd: string, options?: SpawnOptions, pluginName?
     const initialRows = process.stdout.rows ?? 24;
 
     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]
 
     // Run the command in a pty for interactivity

test/orchestrator/mocks/reporter.ts

@@ -89,10 +89,6 @@ export class MockReporter implements Reporter {
     return '';
   }
 
-  async promptSecret(prompt: string): Promise<string | undefined> {
-    return '';
-  }
-
   async promptUserForValues(resourceInfo: ResourceInfo[], promptType: PromptType): Promise<ResourceConfig[]> {
     if (this.config?.promptUserForValues) {
       return this.config.promptUserForValues(resourceInfo);