Updated android studio, aws-cli, aws-profile and homebrew to use the new pty + tests

Author: kevinwang5658

package-lock.json

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

package.json

@@ -1,2 +1,4 @@
 tart clone ghcr.io/kevinwang5658/sonoma-codify:v0.0.3 codify-test-vm
+tart set codify-test-vm --memory 6124 --cpu 4
+
 # tart clone ghcr.io/kevinwang5658/sonoma-codify:v0.0.3 codify-sonoma

scripts/init.sh

@@ -39,7 +39,7 @@ async function launchTestAll(debug: boolean): Promise<void> {
 
 async function launchSingleTest(test: string, debug: boolean) {
   console.log(`Running test: ${test}`)
-  await run(`cirrus run --lazy-pull integration_individual_test_linux -e FILE_NAME="${test}" -o simple`, debug)
+  await run(`cirrus run --lazy-pull integration_individual_test -e FILE_NAME="${test}" -o simple`, debug)
 }
 
 async function run(cmd: string, debug: boolean, simple = true) {

scripts/run-tests.ts

@@ -1,10 +1,10 @@
-import { CreatePlan, Resource, ResourceSettings } from 'codify-plugin-lib';
-import { ResourceConfig } from 'codify-schemas';
-import * as fs from 'node:fs';
+import { CreatePlan, Resource, ResourceSettings, getPty } from 'codify-plugin-lib';
+import { OS, ResourceConfig } from 'codify-schemas';
+import * as fs from 'node:fs/promises';
+import os from 'node:os';
 import path from 'node:path';
 import plist from 'plist';
 
-import { codifySpawn } from '../../utils/codify-spawn.js';
 import { Utils } from '../../utils/index.js';
 import Schema from './android-studio-schema.json';
 import { AndroidStudioPlist, AndroidStudioVersionData } from './types.js';
@@ -21,6 +21,7 @@ export class AndroidStudioResource extends Resource<AndroidStudioConfig> {
   override getSettings(): ResourceSettings<AndroidStudioConfig> {
     return {
       id: 'android-studio',
+      operatingSystems: [OS.Darwin],
       schema: Schema,
       parameterSettings: {
         directory: { type: 'directory', default: '/Applications' },
@@ -50,6 +51,8 @@ export class AndroidStudioResource extends Resource<AndroidStudioConfig> {
   }
 
   override async create(plan: CreatePlan<AndroidStudioConfig>): Promise<void> {
+    const $ = getPty();
+
     if (!this.allAndroidStudioVersions) {
       this.allAndroidStudioVersions = await this.fetchAllAndroidStudioVersions()
     }
@@ -64,16 +67,14 @@ export class AndroidStudioResource extends Resource<AndroidStudioConfig> {
       : versionToDownload.download.find((v) => v.link.includes('mac.dmg'))!
 
     // Create a temporary tmp dir
-    const temporaryDirQuery = await codifySpawn('mktemp -d');
-    const temporaryDir = temporaryDirQuery.data.trim();
+    const temporaryDir = await fs.mkdtemp(path.join(os.tmpdir(), 'codify-android-'))
 
     try {
 
       // Download and unzip the terraform binary
-      await codifySpawn(`curl -fsSL --progress-bar ${downloadLink.link} -o android-studio.dmg`, { cwd: temporaryDir });
-
+      await $.spawn(`curl -fsSL ${downloadLink.link} -o android-studio.dmg`, { cwd: temporaryDir });
 
-      const { data } = await codifySpawn('hdiutil attach android-studio.dmg', { cwd: temporaryDir });
+      const { data } = await $.spawn('hdiutil attach android-studio.dmg', { cwd: temporaryDir });
       const mountedDir = data.split(/\n/)
         .find((l) => l.includes('/Volumes/'))
         ?.split('                 ')
@@ -85,28 +86,27 @@ export class AndroidStudioResource extends Resource<AndroidStudioConfig> {
       }
 
       try {
-        const { data: contents } = await codifySpawn('ls', { cwd: mountedDir })
+        const contents = await fs.readdir(mountedDir);
 
         // Depending on it's preview or regular the name is different
-        const appName = contents.split(/\n/)
+        const appName = contents
           .find((l) => l.includes('Android'))
 
-        await codifySpawn(`rsync -rl "${appName}" Applications/`, { cwd: mountedDir, requiresRoot: true })
-
-
+        // Must rsync because mounted dirs are read-only (can't delete via mv)
+        await $.spawn(`rsync -rl "${appName}" Applications/`, { cwd: mountedDir })
       } finally {
         // Unmount
-        await codifySpawn(`hdiutil detach "${mountedDir}"`)
+        await $.spawnSafe(`hdiutil detach "${mountedDir}"`)
       }
 
     } finally {
       // Delete the tmp directory
-      await codifySpawn(`rm -r ${temporaryDir}`)
+      await fs.rm(temporaryDir, { recursive: true, force: true });
     }
   }
 
   override async destroy(): Promise<void> {
-    await codifySpawn('rm -r "/Applications/Android Studio.app"', { requiresRoot: true })
+    await fs.rm('/Applications/Android Studio.app', { force: true, recursive: true });
   }
 
   private async fetchAllAndroidStudioVersions(): Promise<AndroidStudioVersionData[]> {
@@ -121,7 +121,7 @@ export class AndroidStudioResource extends Resource<AndroidStudioConfig> {
 
   private async addPlistData(location: string): Promise<{ location: string, plist: AndroidStudioPlist } | null> {
     try {
-      const file = fs.readFileSync(path.join(location, '/Contents/Info.plist'), 'utf8');
+      const file = await fs.readFile(path.join(location, '/Contents/Info.plist'), 'utf8');
       const plistData = plist.parse(file) as unknown as AndroidStudioPlist;
 
       return { location, plist: plistData };

src/resources/android/android-studio.ts

@@ -1,7 +1,7 @@
-import { getPty, Resource, ResourceSettings } from 'codify-plugin-lib';
-import { StringIndexedObject } from 'codify-schemas';
+import { Resource, ResourceSettings, getPty, SpawnStatus } from 'codify-plugin-lib';
+import { OS, StringIndexedObject } from 'codify-schemas';
+import fs from 'node:fs/promises';
 
-import { SpawnStatus, codifySpawn } from '../../../utils/codify-spawn.js';
 import { Utils } from '../../../utils/index.js';
 import Schema from './aws-cli-schema.json';
 
@@ -16,6 +16,7 @@ export class AwsCliResource extends Resource<AwsCliConfig> {
   getSettings(): ResourceSettings<AwsCliConfig> {
     return {
       schema: Schema,
+      operatingSystems: [OS.Darwin],
       id: 'aws-cli',
     };
   }
@@ -25,6 +26,8 @@ export class AwsCliResource extends Resource<AwsCliConfig> {
     const $ = getPty();
 
     const awsCliInfo = await $.spawnSafe('which aws');
+    console.log('Spawn result', awsCliInfo);
+
     if (awsCliInfo.status === SpawnStatus.ERROR) {
       return null;
     }
@@ -33,6 +36,8 @@ export class AwsCliResource extends Resource<AwsCliConfig> {
   }
 
   override async create(): Promise<void> {
+    const $ = getPty();
+
     // Amazon has not released a standalone way to install arm aws-cli. See: https://github.com/aws/aws-cli/issues/7252
     // Prefer the homebrew version on M1
     const isArmArch = await Utils.isArmArch();
@@ -41,13 +46,13 @@ export class AwsCliResource extends Resource<AwsCliConfig> {
 
     if (isArmArch && isHomebrewInstalled) {
       console.log('Resource: \'aws-cli\'. Detected that mac is aarch64. Installing AWS-CLI via homebrew')
-      await codifySpawn('brew install awscli')
+      await $.spawn('HOMEBREW_NO_AUTO_UPDATE=1 brew install awscli', { interactive: true })
 
     } else if (!isArmArch || isRosettaInstalled) {
       console.log('Resource: \'aws-cli\'. Detected that mac is not ARM or Rosetta is installed. Installing AWS-CLI standalone version')
-      await codifySpawn('curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "AWSCLIV2.pkg"');
-      await codifySpawn('installer -pkg ./AWSCLIV2.pkg -target /', { requiresRoot: true })
-      await codifySpawn('rm -rf ./AWSCLIV2.pkg')
+      await $.spawn('curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "AWSCLIV2.pkg"');
+      await $.spawn('installer -pkg ./AWSCLIV2.pkg -target /', { requiresRoot: true })
+      await fs.rm('./AWSCLIV2.pkg', { recursive: true, force: true });
 
     } else {
       // This covers arm arch + Homebrew is not installed
@@ -67,24 +72,26 @@ softwareupdate --install-rosetta
   }
 
   override async destroy(): Promise<void> {
+    const $ = getPty();
+
     const installLocation = await this.findInstallLocation();
     if (!installLocation) {
       return;
     }
 
     if (installLocation.includes('homebrew')) {
-      await codifySpawn('brew uninstall awscli');
+      await $.spawn('brew uninstall awscli', { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
       return;
     }
 
-    await codifySpawn(`rm ${installLocation}`, { requiresRoot: true });
-    await codifySpawn(`rm ${installLocation}_completer`, { requiresRoot: true });
-    await codifySpawn('rm -rf /usr/local/aws-cli', { requiresRoot: true });
-    await codifySpawn('rm -rf $HOME/.aws/', { requiresRoot: true });
+    await $.spawn(`rm ${installLocation}`, { requiresRoot: true });
+    await $.spawn(`rm ${installLocation}_completer`, { requiresRoot: true });
+    await $.spawn('rm -rf $HOME/.aws/');
   }
 
   private async findInstallLocation(): Promise<null | string> {
-    const query = await codifySpawn('which aws', { throws: false });
+    const $ = getPty();
+    const query = await $.spawnSafe('which aws', { interactive: true });
     if (query.status === SpawnStatus.ERROR) {
       return null;
     }

src/resources/aws-cli/cli/aws-cli.ts

@@ -1,18 +1,18 @@
 import {
   CreatePlan,
   DestroyPlan,
-  getPty,
   ModifyPlan,
   ParameterChange,
   Resource,
-  ResourceSettings
+  ResourceSettings,
+  SpawnStatus,
+  getPty
 } from 'codify-plugin-lib';
-import { StringIndexedObject } from 'codify-schemas';
+import { OS, StringIndexedObject } from 'codify-schemas';
 import * as fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
-import { SpawnStatus, codifySpawn } from '../../../utils/codify-spawn.js';
 import Schema from './aws-profile-schema.json'
 import { CSVCredentialsTransformation } from './csv-credentials-transformation.js';
 
@@ -32,6 +32,7 @@ export class AwsProfileResource extends Resource<AwsProfileConfig> {
   getSettings(): ResourceSettings<AwsProfileConfig> {
     return {
       id: 'aws-profile',
+      operatingSystems: [OS.Darwin, OS.Linux],
       dependencies: ['aws-cli'],
       schema: Schema,
       parameterSettings: {
@@ -127,8 +128,10 @@ export class AwsProfileResource extends Resource<AwsProfileConfig> {
   }
 
   override async create(plan: CreatePlan<AwsProfileConfig>): Promise<void> {
+    const $ = getPty();
+
     // Assert that aws-cli is installed
-    await codifySpawn('which aws')
+    await $.spawn('which aws', { interactive: true })
 
     const {
       awsAccessKeyId,
@@ -190,7 +193,7 @@ export class AwsProfileResource extends Resource<AwsProfileConfig> {
   private async getAwsConfigureValueOrNull(key: string, profile: string): Promise<string | undefined> {
     const $ = getPty();
 
-    const { data, status } = await $.spawnSafe(`aws configure get ${key} --profile ${profile}`);
+    const { data, status } = await $.spawnSafe(`aws configure get ${key} --profile ${profile}`, { interactive: true });
     if (status === SpawnStatus.ERROR) {
       return undefined;
     }
@@ -199,6 +202,7 @@ export class AwsProfileResource extends Resource<AwsProfileConfig> {
   }
 
   private async setAwsConfigureValue(key: string, value: number | string, profile: string): Promise<void> {
-    await codifySpawn(`aws configure set ${key} ${value} --profile ${profile}`);
+    const $ = getPty();
+    await $.spawn(`aws configure set ${key} ${value} --profile ${profile}`, { interactive: true });
   }
 }

src/resources/aws-cli/profile/aws-profile.ts

@@ -1,9 +1,8 @@
-import { type InputTransformation } from 'codify-plugin-lib';
+import { type InputTransformation, untildify } from 'codify-plugin-lib';
 import * as fsSync from 'node:fs';
 import * as fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { untildify } from '../../../utils/untildify.js';
 import { AwsProfileConfig } from './aws-profile.js';
 
 export const CSVCredentialsTransformation: InputTransformation = {