From ef5163434e9377b3e2d66260e05fa452d5cc17ce Mon Sep 17 00:00:00 2001
From: Keegan Irby <keegani@amazon.com>
Date: Tue, 15 Oct 2024 14:26:18 -0700
Subject: [PATCH] Change implementation of LiveTailRegistry to standard map

---
 .../registry/liveTailSessionRegistry.ts       | 16 +------
 .../registry/liveTailRegistry.test.ts         | 48 +------------------
 2 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts
index 1c8484bfbb1..4e23b3cbe6f 100644
--- a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts
+++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts
@@ -5,10 +5,8 @@
 import * as vscode from 'vscode'
 import { CLOUDWATCH_LOGS_LIVETAIL_SCHEME } from '../../../shared/constants'
 import { LiveTailSession, LiveTailSessionConfiguration } from './liveTailSession'
-import { ToolkitError } from '../../../shared'
-import { NestedMap } from '../../../shared/utilities/map'
 
-export class LiveTailSessionRegistry extends NestedMap<vscode.Uri, LiveTailSession> {
+export class LiveTailSessionRegistry extends Map<vscode.Uri, LiveTailSession> {
     static #instance: LiveTailSessionRegistry
 
     public static get instance() {
@@ -18,18 +16,6 @@ export class LiveTailSessionRegistry extends NestedMap<vscode.Uri, LiveTailSessi
     public constructor() {
         super()
     }
-
-    protected override hash(uri: vscode.Uri): string {
-        return uri.toString()
-    }
-
-    protected override get name(): string {
-        return LiveTailSessionRegistry.name
-    }
-
-    protected override get default(): LiveTailSession {
-        throw new ToolkitError('No LiveTailSession found for provided uri.')
-    }
 }
 
 export function createLiveTailURIFromArgs(sessionData: LiveTailSessionConfiguration): vscode.Uri {
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts
index cdddb6673a5..edb586b4514 100644
--- a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts
+++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts
@@ -4,54 +4,10 @@
  */
 import * as vscode from 'vscode'
 import assert from 'assert'
-import {
-    LiveTailSession,
-    LiveTailSessionConfiguration,
-} from '../../../../awsService/cloudWatchLogs/registry/liveTailSession'
-import {
-    createLiveTailURIFromArgs,
-    LiveTailSessionRegistry,
-} from '../../../../awsService/cloudWatchLogs/registry/liveTailSessionRegistry'
+import { LiveTailSessionConfiguration } from '../../../../awsService/cloudWatchLogs/registry/liveTailSession'
+import { createLiveTailURIFromArgs } from '../../../../awsService/cloudWatchLogs/registry/liveTailSessionRegistry'
 import { CLOUDWATCH_LOGS_LIVETAIL_SCHEME } from '../../../../shared/constants'
 
-/**
- * Exposes protected methods so we can test them
- */
-class TestLiveTailSessionRegistry extends LiveTailSessionRegistry {
-    constructor() {
-        super()
-    }
-
-    override hash(uri: vscode.Uri): string {
-        return super.hash(uri)
-    }
-
-    override get default(): LiveTailSession {
-        return super.default
-    }
-}
-
-describe('LiveTailRegistry', async function () {
-    const session = new LiveTailSession({
-        logGroupName: 'test-log-group',
-        region: 'test-region',
-    })
-
-    let liveTailSessionRegistry: TestLiveTailSessionRegistry
-
-    beforeEach(function () {
-        liveTailSessionRegistry = new TestLiveTailSessionRegistry()
-    })
-
-    it('hash()', function () {
-        assert.deepStrictEqual(liveTailSessionRegistry.hash(session.uri), session.uri.toString())
-    })
-
-    it('default()', function () {
-        assert.throws(() => liveTailSessionRegistry.default)
-    })
-})
-
 describe('LiveTailSession URI', async function () {
     const testLogGroupName = 'test-log-group'
     const testRegion = 'test-region'