fix circular depdendency

Moved the notify message function to a better location to avoid
circular dependency

Signed-off-by: nkomonen-amazon <[email protected]>

Author: nkomonen-amazon

packages/core/src/codewhisperer/activation.ts

@@ -95,6 +95,7 @@ import { SecurityIssueTreeViewProvider } from './service/securityIssueTreeViewPr
 import { setContext } from '../shared/vscode/setContext'
 import { syncSecurityIssueWebview } from './views/securityIssue/securityIssueWebview'
 import { detectCommentAboveLine } from '../shared/utilities/commentUtils'
+import { notifySelectDeveloperProfile } from './region/utils'
 
 let localize: nls.LocalizeFunc
 
@@ -382,7 +383,7 @@ export async function activate(context: ExtContext): Promise<void> {
             }
 
             if (auth.requireProfileSelection()) {
-                await auth.notifySelectProfile()
+                await notifySelectDeveloperProfile()
             }
         },
         { emit: false, functionId: { name: 'activateCwCore' } }

packages/core/src/codewhisperer/region/utils.ts

@@ -0,0 +1,49 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+import { AmazonQPromptSettings } from '../../shared/settings'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import vscode from 'vscode'
+import { selectRegionProfileCommand } from '../commands/basicCommands'
+import { placeholder } from '../../shared/vscode/commands2'
+import { toastMessage } from '../commands/types'
+
+/**
+ * Creates a toast message telling the user they need to select a Developer Profile
+ */
+export async function notifySelectDeveloperProfile() {
+    const suppressId = 'amazonQSelectDeveloperProfile'
+    const settings = AmazonQPromptSettings.instance
+    const shouldShow = settings.isPromptEnabled(suppressId)
+    if (!shouldShow) {
+        return
+    }
+
+    const message = localize(
+        'aws.amazonq.profile.mustSelectMessage',
+        'You must select a Q Developer Profile for Amazon Q features to work.'
+    )
+    const selectProfile = 'Select Profile'
+    const dontShowAgain = 'Dont Show Again'
+
+    await telemetry.toolkit_showNotification.run(async () => {
+        telemetry.record({ id: 'mustSelectDeveloperProfileMessage' })
+        void vscode.window.showWarningMessage(message, selectProfile, dontShowAgain).then(async (resp) => {
+            await telemetry.toolkit_invokeAction.run(async () => {
+                if (resp === selectProfile) {
+                    // Show Profile
+                    telemetry.record({ action: 'select' })
+                    void selectRegionProfileCommand.execute(placeholder, toastMessage)
+                } else if (resp === dontShowAgain) {
+                    telemetry.record({ action: 'dontShowAgain' })
+                    await settings.disablePrompt(suppressId)
+                } else {
+                    telemetry.record({ action: 'ignore' })
+                }
+            })
+        })
+    })
+}

packages/core/src/codewhisperer/util/authUtil.ts

@@ -46,8 +46,7 @@ import { withTelemetryContext } from '../../shared/telemetry/util'
 import { focusAmazonQPanel } from '../../codewhispererChat/commands/registerCommands'
 import { throttle } from 'lodash'
 import { RegionProfileManager } from '../region/regionProfileManager'
-import { selectRegionProfileCommand } from '../commands/basicCommands'
-import { toastMessage } from '../commands/types'
+
 /** Backwards compatibility for connections w pre-chat scopes */
 export const codeWhispererCoreScopes = [...scopesCodeWhispererCore]
 export const codeWhispererChatScopes = [...codeWhispererCoreScopes, ...scopesCodeWhispererChat]
@@ -411,41 +410,6 @@ export class AuthUtil {
         })
     }
 
-    /** Notify the user they need to select a Developer Profile */
-    public async notifySelectProfile() {
-        const suppressId = 'amazonQSelectDeveloperProfile'
-        const settings = AmazonQPromptSettings.instance
-        const shouldShow = settings.isPromptEnabled(suppressId)
-        if (!shouldShow) {
-            return
-        }
-
-        const message = localize(
-            'aws.amazonq.profile.mustSelectMessage',
-            'You must select a Q Developer Profile for Amazon Q features to work.'
-        )
-        const selectProfile = 'Select Profile'
-        const dontShowAgain = 'Dont Show Again'
-
-        await telemetry.toolkit_showNotification.run(async () => {
-            telemetry.record({ id: 'mustSelectDeveloperProfileMessage' })
-            void vscode.window.showWarningMessage(message, selectProfile, dontShowAgain).then(async (resp) => {
-                await telemetry.toolkit_invokeAction.run(async () => {
-                    if (resp === selectProfile) {
-                        // Show Profile
-                        telemetry.record({ action: 'select' })
-                        void selectRegionProfileCommand.execute(placeholder, toastMessage)
-                    } else if (resp === dontShowAgain) {
-                        telemetry.record({ action: 'dontShowAgain' })
-                        await settings.disablePrompt(suppressId)
-                    } else {
-                        telemetry.record({ action: 'ignore' })
-                    }
-                })
-            })
-        })
-    }
-
     @withTelemetryContext({ name: 'notifyReauthenticate', class: authClassName })
     public async notifyReauthenticate(isAutoTrigger?: boolean) {
         void this.showReauthenticatePrompt(isAutoTrigger)