refactor(codewhisperer): remove usage of UserGroupSettings

packages/amazonq/test/unit/codewhisperer/commands/onAcceptance.test.ts

@@ -8,18 +8,14 @@ import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import {
     onAcceptance,
-    UserGroup,
     AcceptedSuggestionEntry,
     session,
     CodeWhispererTracker,
     RecommendationHandler,
-    CodeWhispererUserGroupSettings,
     AuthUtil,
 } from 'aws-core-vscode/codewhisperer'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
-import { globals } from 'aws-core-vscode/shared'
-import { extensionVersion } from 'aws-core-vscode/shared'
 
 describe('onAcceptance', function () {
     describe('onAcceptance', function () {
@@ -31,7 +27,6 @@ describe('onAcceptance', function () {
         afterEach(function () {
             sinon.restore()
             session.reset()
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         it('Should enqueue an event object to tracker', async function () {
@@ -75,11 +70,6 @@ describe('onAcceptance', function () {
         })
 
         it('Should report telemetry that records this user decision event', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.Control,
-                version: extensionVersion,
-            })
-
             const testStartUrl = 'testStartUrl'
             sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
             const mockEditor = createMockTextEditor()
@@ -117,7 +107,6 @@ describe('onAcceptance', function () {
                 codewhispererCompletionType: 'Line',
                 codewhispererLanguage: 'python',
                 credentialStartUrl: testStartUrl,
-                codewhispererUserGroup: 'Control',
             })
         })
     })

packages/amazonq/test/unit/codewhisperer/commands/onInlineAcceptance.test.ts

@@ -8,14 +8,7 @@ import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
-import {
-    onInlineAcceptance,
-    RecommendationHandler,
-    AuthUtil,
-    session,
-    CodeWhispererUserGroupSettings,
-    UserGroup,
-} from 'aws-core-vscode/codewhisperer'
+import { onInlineAcceptance, RecommendationHandler, AuthUtil, session } from 'aws-core-vscode/codewhisperer'
 import { globals } from 'aws-core-vscode/shared'
 import { extensionVersion } from 'aws-core-vscode/shared'
 
@@ -29,7 +22,6 @@ describe('onInlineAcceptance', function () {
         afterEach(function () {
             sinon.restore()
             session.reset()
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         it('Should dispose inline completion provider', async function () {
@@ -53,7 +45,6 @@ describe('onInlineAcceptance', function () {
 
         it('Should report telemetry that records this user decision event', async function () {
             await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.Classifier,
                 version: extensionVersion,
             })
 
@@ -95,7 +86,6 @@ describe('onInlineAcceptance', function () {
                 codewhispererCompletionType: 'Line',
                 codewhispererLanguage: 'python',
                 credentialStartUrl: testStartUrl,
-                codewhispererUserGroup: 'Classifier',
             })
         })
     })

packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts

@@ -13,14 +13,12 @@ import {
     resetCodeWhispererGlobalVariables,
 } from 'aws-core-vscode/test'
 import * as EditorContext from 'aws-core-vscode/codewhisperer'
-import * as CodeWhispererConstants from 'aws-core-vscode/codewhisperer'
 import {
     ConfigurationEntry,
     DocumentChangedSource,
     KeyStrokeHandler,
     DefaultDocumentChangedType,
     RecommendationService,
-    CodeWhispererUserGroupSettings,
     ClassifierTrigger,
     isInlineCompletionEnabled,
     RecommendationHandler,
@@ -52,7 +50,6 @@ describe('keyStrokeHandler', function () {
         })
         afterEach(function () {
             sinon.restore()
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         it('Whatever the input is, should skip when automatic trigger is turned off, should not call invokeAutomatedTrigger', async function () {
@@ -145,19 +142,13 @@ describe('keyStrokeHandler', function () {
             }
         })
 
-        async function testShouldInvoke(
-            input: string,
-            shouldTrigger: boolean,
-            rightContext: string = '',
-            userGroup: CodeWhispererConstants.UserGroup = CodeWhispererConstants.UserGroup.Control
-        ) {
+        async function testShouldInvoke(input: string, shouldTrigger: boolean, rightContext: string = '') {
             const mockEditor = createMockTextEditor(rightContext, 'test.js', 'javascript', 0, 0)
             const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
                 mockEditor.document,
                 new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
                 input
             )
-            CodeWhispererUserGroupSettings.instance.userGroup = userGroup
             await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
             assert.strictEqual(
                 invokeSpy.called,

packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts

@@ -10,13 +10,11 @@ import {
     ReferenceInlineProvider,
     session,
     AuthUtil,
-    CodeWhispererUserGroupSettings,
     DefaultCodeWhispererClient,
     RecommendationsList,
     ConfigurationEntry,
     RecommendationHandler,
     CodeWhispererCodeCoverageTracker,
-    UserGroup,
     supplementalContextUtil,
 } from 'aws-core-vscode/codewhisperer'
 import {
@@ -26,7 +24,6 @@ import {
     resetCodeWhispererGlobalVariables,
 } from 'aws-core-vscode/test'
 // import * as supplementalContextUtil from 'aws-core-vscode/codewhisperer'
-import { globals, extensionVersion } from 'aws-core-vscode/shared'
 
 describe('recommendationHandler', function () {
     const config: ConfigurationEntry = {
@@ -55,7 +52,6 @@ describe('recommendationHandler', function () {
 
         afterEach(function () {
             sinon.restore()
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         it('should assign correct recommendations given input', async function () {
@@ -110,11 +106,6 @@ describe('recommendationHandler', function () {
         })
 
         it('should call telemetry function that records a CodeWhisperer service invocation', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.CrossFile,
-                version: extensionVersion,
-            })
-
             const mockServerResult = {
                 recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
                 $response: {
@@ -157,16 +148,10 @@ describe('recommendationHandler', function () {
                 codewhispererSupplementalContextTimeout: false,
                 codewhispererSupplementalContextLatency: 0,
                 codewhispererSupplementalContextLength: 100,
-                codewhispererUserGroup: 'CrossFile',
             })
         })
 
         it('should call telemetry function that records a Empty userDecision event', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.CrossFile,
-                version: extensionVersion,
-            })
-
             const mockServerResult = {
                 recommendations: [],
                 nextToken: '',
@@ -198,7 +183,6 @@ describe('recommendationHandler', function () {
                 codewhispererCompletionType: 'Line',
                 codewhispererLanguage: 'python',
                 credentialStartUrl: testStartUrl,
-                codewhispererUserGroup: 'CrossFile',
             })
         })
     })

packages/amazonq/test/unit/codewhisperer/service/telemetry.test.ts

@@ -53,7 +53,6 @@ describe.skip('CodeWhisperer telemetry', async function () {
             codewhispererSuggestionState: 'Accept',
             codewhispererSuggestionImportCount: 0,
             codewhispererTypeaheadLength: 0,
-            codewhispererUserGroup: 'Control',
             ...ops,
         }
     }

packages/amazonq/test/unit/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts

@@ -6,16 +6,9 @@
 import assert from 'assert'
 import * as sinon from 'sinon'
 import * as vscode from 'vscode'
-import {
-    CodeWhispererCodeCoverageTracker,
-    vsCodeState,
-    TelemetryHelper,
-    AuthUtil,
-    UserGroup,
-    CodeWhispererUserGroupSettings,
-} from 'aws-core-vscode/codewhisperer'
+import { CodeWhispererCodeCoverageTracker, vsCodeState, TelemetryHelper, AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { createMockDocument, createMockTextEditor, resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
-import { globals, extensionVersion } from 'aws-core-vscode/shared'
+import { globals } from 'aws-core-vscode/shared'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
 
 describe('codewhispererCodecoverageTracker', function () {
@@ -516,21 +509,14 @@ describe('codewhispererCodecoverageTracker', function () {
             if (tracker) {
                 sinon.stub(tracker, 'isActive').returns(true)
             }
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         afterEach(function () {
             sinon.restore()
             CodeWhispererCodeCoverageTracker.instances.clear()
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         it('should emit correct code coverage telemetry in python file', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.Control,
-                version: extensionVersion,
-            })
-
             const tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
 
             const assertTelemetry = assertTelemetryCurried('codewhisperer_codePercentage')
@@ -545,16 +531,10 @@ describe('codewhispererCodecoverageTracker', function () {
                 codewhispererSuggestedTokens: 7,
                 codewhispererPercentage: 7,
                 successCount: 1,
-                codewhispererUserGroup: 'Control',
             })
         })
 
         it('should emit correct code coverage telemetry when success count = 0', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.Control,
-                version: extensionVersion,
-            })
-
             const tracker = CodeWhispererCodeCoverageTracker.getTracker('java')
 
             const assertTelemetry = assertTelemetryCurried('codewhisperer_codePercentage')
@@ -574,7 +554,6 @@ describe('codewhispererCodecoverageTracker', function () {
                 codewhispererSuggestedTokens: 18,
                 codewhispererPercentage: 60,
                 successCount: 2,
-                codewhispererUserGroup: 'Control',
             })
         })
     })

packages/amazonq/test/unit/codewhisperer/tracker/codewhispererTracker.test.ts

@@ -6,14 +6,9 @@
 import assert from 'assert'
 import * as sinon from 'sinon'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
-import {
-    AuthUtil,
-    CodeWhispererTracker,
-    UserGroup,
-    CodeWhispererUserGroupSettings,
-} from 'aws-core-vscode/codewhisperer'
+import { AuthUtil, CodeWhispererTracker } from 'aws-core-vscode/codewhisperer'
 import { resetCodeWhispererGlobalVariables, createAcceptedSuggestionEntry } from 'aws-core-vscode/test'
-import { globals, extensionVersion } from 'aws-core-vscode/shared'
+import { globals } from 'aws-core-vscode/shared'
 
 describe('codewhispererTracker', function () {
     describe('enqueue', function () {
@@ -86,20 +81,7 @@ describe('codewhispererTracker', function () {
     })
 
     describe('emitTelemetryOnSuggestion', function () {
-        beforeEach(function () {
-            CodeWhispererUserGroupSettings.instance.reset()
-        })
-
-        afterEach(function () {
-            CodeWhispererUserGroupSettings.instance.reset()
-        })
-
         it('Should call recordCodewhispererUserModification with suggestion event', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.CrossFile,
-                version: extensionVersion,
-            })
-
             const testStartUrl = 'testStartUrl'
             sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
             const suggestion = createAcceptedSuggestionEntry()
@@ -114,7 +96,6 @@ describe('codewhispererTracker', function () {
                 codewhispererCompletionType: 'Line',
                 codewhispererLanguage: 'java',
                 credentialStartUrl: testStartUrl,
-                codewhispererUserGroup: 'CrossFile',
                 codewhispererCharactersAccepted: suggestion.originalString.length,
                 codewhispererCharactersModified: 0,
             })