move check into its own function

Author: Hweinstock

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

@@ -33,11 +33,18 @@ export class SshKeyPair {
         return new SshKeyPair(keyPath, lifetime)
     }
 
-    public static async generateSshKeyPair(keyPath: string): Promise<void> {
-        const keyGenerated = await this.tryKeyTypes(keyPath, ['ed25519', 'rsa'])
-        if (!keyGenerated || !(await fs.existsFile(keyPath))) {
-            throw new ToolkitError('ec2: Unable to generate ssh key pair')
+    private static async assertGenerated(keyPath: string, keyGenerated: boolean): Promise<never | void> {
+        if (!keyGenerated) {
+            throw new ToolkitError('ec2: Unable to generate ssh key pair with either ed25519 or rsa')
+        }
+        if (!(await fs.exists(keyPath))) {
+            throw new ToolkitError(`ec2: Failed to generate keys, resulting key not found at ${keyPath}`)
         }
+    }
+
+    public static async generateSshKeyPair(keyPath: string): Promise<void> {
+        const keyGenerated = await SshKeyPair.tryKeyTypes(keyPath, ['ed25519', 'rsa'])
+        await SshKeyPair.assertGenerated(keyPath, keyGenerated)
         // Should already be the case, but just in case we assert permissions.
         // skip on Windows since it only allows write permission to be changed.
         if (!globals.isWeb && os.platform() !== 'win32') {

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

@@ -155,13 +155,14 @@ describe('Ec2ConnectClient', function () {
                 instanceId: 'test-id',
                 region: 'test-region',
             }
-            const keyPath = path.join((await createTestWorkspaceFolder()).uri.path, 'keys')
+            const testWorkspaceFolder = await createTestWorkspaceFolder()
+            const keyPath = path.join(testWorkspaceFolder.uri.path, 'keys')
             const keys = await SshKeyPair.getSshKeyPair(keyPath, 30000)
             await client.sendSshKeyToInstance(testSelection, keys, 'test-user')
             const privKey = await fs.readFileText(keys.getPrivateKeyPath())
             assertNoTelemetryMatch(privKey)
             sinon.restore()
-            await keys.delete()
+            await fs.delete(testWorkspaceFolder.uri)
         })
     })