make progress on ec2

Author: Hweinstock

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

@@ -28,7 +28,7 @@ import { showMessageWithCancel } from '../../shared/utilities/messages'
 import { SshConfig } from '../../shared/sshConfig'
 import { SshKeyPair } from './sshKeyPair'
 import { Ec2SessionTracker } from './remoteSessionManager'
-import { getEc2SsmEnv, getRemoveLabeledEntriesCommand } from './utils'
+import { getEc2SsmEnv, getRemoveLinesCommand } from './utils'
 
 export type Ec2ConnectErrorCode = 'EC2SSMStatus' | 'EC2SSMPermission' | 'EC2SSMConnect' | 'EC2SSMAgentStatus'
 
@@ -268,14 +268,13 @@ export class Ec2Connecter implements vscode.Disposable {
         const hintComment = '# Added by AWS Toolkit for VSCode'
 
         const remoteAuthorizedKeysPath = `/home/${remoteUser}/.ssh/authorized_keys`
-        const deleteExistingKeyCommand = getRemoveLabeledEntriesCommand(hintComment, remoteAuthorizedKeysPath)
+        const deleteExistingKeyCommand = getRemoveLinesCommand(hintComment, remoteAuthorizedKeysPath)
 
         const appendStr = (s: string) => `echo "${s}" >> ${remoteAuthorizedKeysPath}`
-        const writeCommentCommand = appendStr(hintComment)
-        const writeKeyCommand = appendStr(sshPubKey)
+        const writeKeyCommand = appendStr([sshPubKey, hintComment].join(' '))
 
         await this.ssmClient.sendCommandAndWait(selection.instanceId, 'AWS-RunShellScript', {
-            commands: [deleteExistingKeyCommand, writeCommentCommand, writeKeyCommand],
+            commands: [deleteExistingKeyCommand, writeKeyCommand],
         })
     }
 

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

@@ -47,11 +47,11 @@ export function getEc2SsmEnv(
     )
 }
 /**
- * Generate bash command (as string) to remove lines in file prefixed by `hintComment`.
- * @param hintComment prefix comment for deleted lines.
+ * Generate bash command (as string) to remove lines in file suffixed by `hintComment`.
+ * @param hintComment suffix comment for deleted lines.
  * @param filepath filepath (as string) to target with the command.
  * @returns bash command to remove lines from file.
  */
-export function getRemoveLabeledEntriesCommand(hintComment: string, filepath: string): string {
-    return `sed -i '' '/${hintComment}/N; /${hintComment}/ {N; d}' ${filepath}`
+export function getRemoveLinesCommand(hintComment: string, filepath: string): string {
+    return `sed /${hintComment}/d ${filepath}`
 }

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

@@ -6,8 +6,12 @@
 import assert from 'assert'
 import * as sinon from 'sinon'
 import { SafeEc2Instance } from '../../../shared/clients/ec2Client'
-import { getIconCode } from '../../../awsService/ec2/utils'
-import { DefaultAwsContext } from '../../../shared'
+import { getIconCode, getRemoveLinesCommand } from '../../../awsService/ec2/utils'
+import { DefaultAwsContext, globals } from '../../../shared'
+import { fs } from '../../../shared/fs/fs'
+import { createTestWorkspaceFolder } from '../../testUtil'
+import path from 'path'
+import { ChildProcess } from '../../../shared/utilities/processUtils'
 
 describe('utils', async function () {
     before(function () {
@@ -52,4 +56,25 @@ describe('utils', async function () {
             assert.strictEqual(getIconCode(stoppingInstance), 'loading~spin')
         })
     })
+
+    describe('getRemoveLinesCommand', async function () {
+        it('removes lines prefixed by pattern', async function () {
+            const pattern = 'pattern'
+            const lines = ['line1', 'line2 pattern', 'line3', 'line4 pattern', 'line5', 'line6 pattern', 'line7']
+            const expected = ['line1', 'line3', 'line5', 'line7']
+            const tempPath = await createTestWorkspaceFolder()
+            const textFile = path.join(tempPath.uri.fsPath, 'test.txt')
+            await fs.writeFile(textFile, lines.join('\n'))
+
+            const [command, ...args] = getRemoveLinesCommand(pattern, textFile).split(' ')
+            const process = new ChildProcess(command, args, { collect: true })
+            const result = await process.run()
+
+            assert.strictEqual(result.exitCode, 0, `ChildProcess failed with error=${result.error}`)
+            const newContent = await fs.readFileText(textFile)
+
+            assert.strictEqual(newContent, expected.join('\n') + '\n')
+            await fs.delete(tempPath.uri.fsPath, { recursive: true, force: true })
+        })
+    })
 })