switch to checking if OS is mac

Author: Hweinstock

packages/core/src/awsService/ec2/model.ts

@@ -342,14 +342,14 @@ export class Ec2Connecter implements vscode.Disposable {
 }
 
 /**
- * Generate bash command (as string) to remove lines in file suffixed by `hintComment`.
- * @param hintComment suffix comment for deleted lines.
+ * Generate bash command (as string) to remove lines containing `hintComment`.
+ * @param pattern pattern for deleted lines.
  * @param filepath filepath (as string) to target with the command.
  * @returns bash command to remove lines from file.
  */
-export function getRemoveLinesCommand(hintComment: string, hostOS: Ec2OS, filepath: string): string {
+export function getRemoveLinesCommand(pattern: string, hostOS: Ec2OS, filepath: string): string {
     // Linux allows not passing extension to -i, whereas macOS requires zero length extension.
-    return `sed -i ${isLinux(hostOS) ? '' : "''"} /${hintComment}/d ${filepath}`
+    return `sed -i ${isLinux(hostOS) ? '' : "''"} /${pattern}/d ${filepath}`
 }
 
 function isLinux(os: Ec2OS): boolean {

packages/core/src/shared/vscode/env.ts

@@ -134,7 +134,7 @@ export function isRemoteWorkspace(): boolean {
  * Example: `5.10.220-188.869.amzn2int.x86_64`
  */
 export function isAmazonInternalOs() {
-    return os.release().includes('amzn2int') && isLinux()
+    return os.release().includes('amzn2int') && process.platform === 'linux'
 }
 
 /**
@@ -149,6 +149,9 @@ export async function isCloudDesktop() {
     return (await new ChildProcess('/apollo/bin/getmyfabric').run().then((r) => r.exitCode)) === 0
 }
 
+export function isMac(): boolean {
+    return process.platform === 'darwin'
+}
 /** Returns true if OS is Windows. */
 export function isWin(): boolean {
     // if (isWeb()) {
@@ -158,10 +161,6 @@ export function isWin(): boolean {
     return process.platform === 'win32'
 }
 
-export function isLinux(): boolean {
-    return process.platform === 'linux'
-}
-
 const UIKind = {
     [vscode.UIKind.Desktop]: 'desktop',
     [vscode.UIKind.Web]: 'web',

packages/core/src/test/awsService/ec2/model.test.ts

@@ -17,7 +17,7 @@ import { assertNoTelemetryMatch, createTestWorkspaceFolder } from '../../testUti
 import { fs } from '../../../shared'
 import path from 'path'
 import { ChildProcess } from '../../../shared/utilities/processUtils'
-import { isLinux, isWin } from '../../../shared/vscode/env'
+import { isMac, isWin } from '../../../shared/vscode/env'
 
 describe('Ec2ConnectClient', function () {
     let client: Ec2Connecter
@@ -213,12 +213,12 @@ describe('getRemoveLinesCommand', async function () {
         await fs.delete(tempPath.uri.fsPath, { recursive: true, force: true })
     })
 
-    it('removes lines prefixed by pattern', async function () {
+    it('removes lines containing pattern', async function () {
         if (isWin()) {
             this.skip()
         }
         // For the test, we only need to distinguish mac and linux
-        const hostOS = isLinux() ? 'Amazon Linux' : 'macOS'
+        const hostOS = isMac() ? 'macOS' : 'Amazon Linux'
         const lines = ['line1', 'line2 pattern', 'line3', 'line4 pattern', 'line5', 'line6 pattern', 'line7']
         const expected = ['line1', 'line3', 'line5', 'line7']