Merge master into feature/q-dev-ux

Author: aws-toolkit-automation

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

@@ -14,7 +14,6 @@ type sshKeyType = 'rsa' | 'ed25519'
 export class SshKeyPair {
     private publicKeyPath: string
     private lifeTimeout: Timeout
-    private deleted: boolean = false
 
     private constructor(
         private readonly keyPath: string,
@@ -79,12 +78,12 @@ export class SshKeyPair {
         if (!this.lifeTimeout.completed) {
             this.lifeTimeout.cancel()
         }
-
-        this.deleted = true
     }
 
-    public isDeleted(): boolean {
-        return this.deleted
+    public async isDeleted(): Promise<boolean> {
+        const privateKeyDeleted = !(await fs.existsFile(this.getPrivateKeyPath()))
+        const publicKeyDeleted = !(await fs.existsFile(this.getPublicKeyPath()))
+        return privateKeyDeleted || publicKeyDeleted
     }
 
     public timeAlive(): number {

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

@@ -126,4 +126,32 @@ describe('SshKeyUtility', async function () {
         sinon.assert.calledOnce(deleteStub)
         sinon.restore()
     })
+
+    it('determines deleted status based on file system', async function () {
+        await fs.delete(keyPair.getPrivateKeyPath())
+        await fs.delete(keyPair.getPublicKeyPath())
+
+        assert(keyPair.isDeleted())
+    })
+
+    describe('isDeleted', async function () {
+        it('returns false if key files exist', async function () {
+            assert.strictEqual(await keyPair.isDeleted(), false)
+        })
+
+        it('returns true if key files do not exist', async function () {
+            await keyPair.delete()
+            assert.strictEqual(await keyPair.isDeleted(), true)
+        })
+
+        it('returns true if private key remains', async function () {
+            await fs.delete(keyPair.getPublicKeyPath())
+            assert.strictEqual(await keyPair.isDeleted(), true)
+        })
+
+        it('returns true if public key remains', async function () {
+            await fs.delete(keyPair.getPrivateKeyPath())
+            assert.strictEqual(await keyPair.isDeleted(), true)
+        })
+    })
 })